From 74588bf88adc304a49144874077d718202415408 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 20 Dec 2017 13:22:00 +0000 Subject: [PATCH 001/312] hadoop: 2.2.0 -> 2.7.5, 2.8.3, 2.9.0, 3.0.0 --- .../networking/cluster/hadoop/default.nix | 182 +++++++++++++----- pkgs/top-level/all-packages.nix | 7 +- 2 files changed, 144 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 9af4cf3f0ed6..f96ee42fb1c1 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,51 +1,145 @@ -{ stdenv, fetchurl, makeWrapper, which, jre, bash }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }: -stdenv.mkDerivation rec { - name = "hadoop-2.2.0"; +let + common = { version, sha256, dependencies-sha256, tomcat }: + let + # compile the hadoop tarball from sources, it requires some patches + binary-distributon = stdenv.mkDerivation rec { + name = "hadoop-${version}-bin"; + src = fetchurl { + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}-src.tar.gz"; + inherit sha256; + }; - src = fetchurl { - url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; - sha256 = "0r0kx8arsrvmcfy0693hpv4cz3i0razvk1xa3yhlf3ybb80a8106"; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) + fetched-maven-deps = stdenv.mkDerivation { + name = "hadoop-${version}-maven-deps"; + inherit src nativeBuildInputs buildInputs configurePhase; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,xml,sha1,so,dll,dylib} and delete all ephemeral files with lastModified timestamps inside + installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = dependencies-sha256; + }; + + nativeBuildInputs = [ maven cmake pkgconfig ]; + buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated + postPatch = '' + for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ + hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DockerContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java \ + hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java; do + if [ -f "$file" ]; then + substituteInPlace "$file" \ + --replace '/usr/bin/stat' 'stat' \ + --replace '/bin/bash' 'bash' \ + --replace '/bin/ls' 'ls' \ + --replace '/bin/mv' 'mv' + fi + done + ''; + configurePhase = "true"; # do not trigger cmake hook + mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; + # prevent downloading tomcat during the build + preBuild = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + buildPhase = '' + # 'maven.repo.local' must be writable + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} + # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 + ''; + installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; + }; + in + stdenv.mkDerivation rec { + name = "hadoop-${version}"; + + src = binary-distributon; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/doc/hadoop/ + cp -dpR * $out/ + mv $out/*.txt $out/share/doc/hadoop/ + + for n in $out/bin/*; do + if [ -f "$n" ]; then # only regular files + wrapProgram "$n" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --set JAVA_HOME "${jre}" \ + --set HADOOP_PREFIX "$out" + fi + done + ''; + + meta = with stdenv.lib; { + homepage = "http://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = licenses.asl20; + + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; + + tomcat_6_0_48 = rec { + version = "6.0.48"; + src = fetchurl { + # do not use "mirror://apache/" here, tomcat-6 is legacy and has been removed from the mirrors + url = "https://archive.apache.org/dist/tomcat/tomcat-6/v${version}/bin/apache-tomcat-${version}.tar.gz"; + sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; + }; }; - buildInputs = [ makeWrapper ]; - - buildPhase = '' - for n in "bin/"* "sbin/"*; do - sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" - done - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; - ''; - - installPhase = '' - mkdir -p $out - mv *.txt share/doc/hadoop/ - mv * $out - - for n in $out/{bin,sbin}"/"*; do - wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" - done - ''; - - meta = { - homepage = http://hadoop.apache.org/; - description = "Framework for distributed processing of large data sets across clusters of computers"; - license = stdenv.lib.licenses.asl20; - - longDescription = '' - The Apache Hadoop software library is a framework that allows for - the distributed processing of large data sets across clusters of - computers using a simple programming model. It is designed to - scale up from single servers to thousands of machines, each - offering local computation and storage. Rather than rely on - hardware to deliver high-avaiability, the library itself is - designed to detect and handle failures at the application layer, - so delivering a highly-availabile service on top of a cluster of - computers, each of which may be prone to failures. - ''; - - platforms = stdenv.lib.platforms.linux; +in { + hadoop_2_7 = common { + version = "2.7.5"; + sha256 = "0dvgi4z2pi45b0yzzm9zxjp0lwvd8lwqn4903mxlqh7xv2g3llnp"; + dependencies-sha256 = "137v077q022997ih41n412l2xq4ynypk5dl5p4n16i16745k9lk2"; + tomcat = tomcat_6_0_48; + }; + hadoop_2_8 = common { + version = "2.8.3"; + sha256 = "0ziairmgfi05iqmib66lysanlabrp1cq6palnmwkiss098b5dcjd"; + dependencies-sha256 = "1qmdmiprr0l0i0q3w9nv964db5cm3615iqczywrs5v8qaaf580b3"; + tomcat = tomcat_6_0_48; + }; + hadoop_2_9 = common { + version = "2.9.0"; + sha256 = "03mh193bccm4bi7cq6ym651zal82d0kvl00yhnzzrsnwq10j2h62"; + dependencies-sha256 = "0773lw4d03r89dcrrsglbr4zgcz2m9b15587nxdz4clm2f5gqiw5"; + tomcat = tomcat_6_0_48; + }; + hadoop_3_0 = common { + version = "3.0.0"; + sha256 = "0h22mdpgvg9v4rbc8gn4m8vrpkq45lwk7m8f5c25fvnzdyrc8fzc"; + dependencies-sha256 = "0ghbl768al3wpgz0rx2mqbnf6p7cdqpkq6yk6hgf65b4qab4aw9v"; + tomcat = null; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 944cdcda8faf..019f9c29ec8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6586,7 +6586,12 @@ with pkgs; guile = guile_2_2; - hadoop = callPackage ../applications/networking/cluster/hadoop { }; + inherit (callPackages ../applications/networking/cluster/hadoop { }) + hadoop_2_7 + hadoop_2_8 + hadoop_2_9 + hadoop_3_0; + hadoop = hadoop_2_7; io = callPackage ../development/interpreters/io { }; From 13ad4c09a32eb855fd389f20e0b31fae4318de32 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 22 Dec 2017 21:58:39 +0000 Subject: [PATCH 002/312] hadoop: avoid using wrapProgram Script renaming may result to weird things: http://i.imgur.com/0Xee013.png# --- pkgs/applications/networking/cluster/hadoop/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index f96ee42fb1c1..8c8e258ccd10 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -72,13 +72,18 @@ let nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/share/doc/hadoop/ + mkdir -p $out/share/doc/hadoop cp -dpR * $out/ mv $out/*.txt $out/share/doc/hadoop/ + # + # Do not use `wrapProgram` here, script renaming may result to weird things: http://i.imgur.com/0Xee013.png + # + mkdir -p $out/bin.wrapped for n in $out/bin/*; do if [ -f "$n" ]; then # only regular files - wrapProgram "$n" \ + mv $n $out/bin.wrapped/ + makeWrapper $out/bin.wrapped/$(basename $n) $n \ --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ From 8585bd87a01a3de0f2ee17bc7f28b84481013c7e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 2 May 2018 12:29:20 +0900 Subject: [PATCH 003/312] linux_mptcp: 0.93 -> 0.94 As mptcp is still evolving, it's good to keep at least the 2 last versions for regression-testing. --- .../linux/kernel/linux-mptcp-93.nix | 47 +++++++++++++++++++ pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +-- pkgs/top-level/all-packages.nix | 13 +++++ 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-mptcp-93.nix diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix new file mode 100644 index 000000000000..2efe357cbd68 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +buildLinux (rec { + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; + version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + + extraMeta = { + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; + }; + + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + }; + + extraConfig = '' + IPV6 y + MPTCP y + IP_MULTIPLE_TABLES y + + # Enable advanced path-managers... + MPTCP_PM_ADVANCED y + MPTCP_FULLMESH y + MPTCP_NDIFFPORTS y + # ... but use none by default. + # The default is safer if source policy routing is not setup. + DEFAULT_DUMMY y + DEFAULT_MPTCP_PM default + + # MPTCP scheduler selection. + # Disabled as the only non-default is the useless round-robin. + MPTCP_SCHED_ADVANCED n + DEFAULT_MPTCP_SCHED default + + # Smarter TCP congestion controllers + TCP_CONG_LIA m + TCP_CONG_OLIA m + TCP_CONG_WVEGAS m + TCP_CONG_BALIA m + + '' + (args.extraConfig or ""); +} // args) + diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abeda..0ff0e747bfdc 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.93"; - modDirVersion = "4.9.60"; + mptcpVersion = "0.94"; + modDirVersion = "4.14.24"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; }; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba524aa722a..c2546ec3e9a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13339,6 +13339,19 @@ with pkgs; # linux mptcp is based on the 4.4 kernel linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.cpu-cgroup-v2."4.11" + 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_mptcp_93 = callPackage ../os-specific/linux/kernel/linux-mptcp-93.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes From bf22a10ccb58ab416c8795be041a0cfbb2dd5dde Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 20 May 2018 16:42:33 +0100 Subject: [PATCH 004/312] tdesktop: enable on other platforms --- .../instant-messengers/telegram/tdesktop/generic.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7581482504b7..732ea95dd07c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -90,6 +90,10 @@ mkDerivation rec { sed -i Telegram/gyp/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" + # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out + sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ + -e "/-msse2/d" + gyp \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ @@ -133,7 +137,7 @@ mkDerivation rec { description = "Telegram Desktop messaging app " + (if stable then "(stable version)" else "(pre-release)"); license = licenses.gpl3; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; homepage = https://desktop.telegram.org/; maintainers = with maintainers; [ primeos abbradar garbas ]; }; From c61aad65744cbeca78504b64f4b346870e3bf2f7 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 30 May 2018 22:30:12 -0400 Subject: [PATCH 005/312] restic: add s3CredentialsFile option --- nixos/modules/services/backup/restic.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 21d82469c605..2d14762e8685 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -14,7 +14,15 @@ with lib; Read the repository password from a file. ''; example = "/etc/nixos/restic-password"; + }; + s3CredentialsFile = mkOption { + type = with types; nullOr str; + description = '' + file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY + for an S3-hosted repository, in the format of an EnvironmentFile + as described by systemd.exec(5) + ''; }; repository = mkOption { @@ -134,6 +142,8 @@ with lib; Type = "oneshot"; ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}"; User = backup.user; + } // optionalAttrs (backup.s3CredentialsFile != null) { + EnvironmentFile = backup.s3CredentialsFile; }; } // optionalAttrs backup.initialize { preStart = '' From 31714e44b755889db2ccf54d4c1f26157a05bf5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 4 Jun 2018 14:14:57 +0200 Subject: [PATCH 006/312] nixos/tt-rss: Support plugins and themes The extra config is required to configure some plugins. --- nixos/modules/services/web-apps/tt-rss.nix | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 610c6463a5eb..1646ee5964fb 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -76,6 +76,8 @@ let define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}'); define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}'); define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}'); + + ${cfg.extraConfig} ''; in { @@ -431,6 +433,26 @@ let ''; }; + pluginPackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of plugins to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the plugins.local directory. + ''; + }; + + themePackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of themes to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the themes.local directory. + ''; + }; + logDestination = mkOption { type = types.enum ["" "sql" "syslog"]; default = "sql"; @@ -441,6 +463,14 @@ let error.log). ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines to append to config.php. + ''; + }; }; }; @@ -517,6 +547,16 @@ let rm -rf "${cfg.root}/*" mkdir -m 755 -p "${cfg.root}" cp -r "${pkgs.tt-rss}/"* "${cfg.root}" + ${optionalString (cfg.pluginPackages != []) '' + for plugin in ${concatStringsSep " " cfg.pluginPackages}; do + cp -r "$plugin"/* "${cfg.root}/plugins.local/" + done + ''} + ${optionalString (cfg.themePackages != []) '' + for theme in ${concatStringsSep " " cfg.themePackages}; do + cp -r "$theme"/* "${cfg.root}/themes.local/" + done + ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chown -R "${cfg.user}" "${cfg.root}" chmod -R 755 "${cfg.root}" From e598fdf2294998b233d11ae707dc22230b5d67e2 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Thu, 7 Jun 2018 16:44:04 +0200 Subject: [PATCH 007/312] dbus: Add NSS modules path to dbus system bus service DBus seems to resolve user IDs directly via glibc, circumventing nscd. In more advanced setups this leads to user's coming from LDAP or SSSD not being resolved by the dbus system bus daemon. The effect for such users is, that all access to the system bus (e.g. busctl or nmcli) is denied. Adding the respective NSS modules to the service's environment solves the issue the same way it does for nscd. --- nixos/modules/services/system/dbus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 643bec188142..248df7351a8c 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -100,6 +100,7 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; + environment = { LD_LIBRARY_PATH = config.system.nssModules.path; }; }; systemd.user = { From c0c43e9c0767bb49a836d165f2b542a3e1334362 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 28 Apr 2018 20:05:00 +0000 Subject: [PATCH 008/312] lib: simplify `mkAliasAndWrapDefinitions` --- lib/modules.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 8baae4917053..19e553bbc9b9 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -532,9 +532,7 @@ rec { # mkAliasDefinitions = mkAliasAndWrapDefinitions id; mkAliasAndWrapDefinitions = wrap: option: - mkMerge - (optional (isOption option && option.isDefined) - (wrap (mkMerge option.definitions))); + mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions)); /* Compatibility. */ From 449d43fe01d9406d5fb74a687167dee316ec0ca9 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 28 Apr 2018 20:16:37 +0000 Subject: [PATCH 009/312] lib: fix and simplify `doRename` Before this change `mkRenamedOptionModule` would override option defaults even when the old option name is left unused. For instance ```nix { optios = { services.name.new = mkOption { default = { one = {}; }; }; }; imports = [ (mkRenamedOptionModule [ "services" "name" "old" ] [ "services" "name" "new" "two" ]) ]; config = {}; } ``` would evaluate to `{ config.services.name.new = { two = {}; }; }` when you'd expect it to evaluate to `{ config.services.name.new = { one = {}; }; }`. --- lib/modules.nix | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 19e553bbc9b9..bb4a659e7a72 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -667,22 +667,26 @@ rec { }; doRename = { from, to, visible, warn, use }: + { config, options, ... }: let + fromOpt = getAttrFromPath from options; + toOpt = getAttrFromPath to options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); in - { config, options, ... }: - { options = setAttrByPath from (mkOption { - inherit visible; - description = "Alias of ."; - apply = x: use (toOf config); - }); - config = { - warnings = - let opt = getAttrFromPath from options; in - optional (warn && opt.isDefined) - "The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'."; - } // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options)); - }; + { + options = setAttrByPath from (mkOption { + inherit visible; + description = "Alias of ."; + apply = x: use (toOf config); + }); + config = mkMerge [ + { + warnings = optional (warn && fromOpt.isDefined) + "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'."; + } + (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt) + ]; + }; } From f67a83c7c41ec38d744a9b175b526174cff0275d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 11 Jun 2018 18:43:38 -0700 Subject: [PATCH 010/312] Add imalison maintainer --- maintainers/maintainer-list.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a5845cafe3c..c76cfd60b2ea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -566,7 +566,7 @@ email = "brandon.barker@gmail.com"; github = "bbarker"; name = "Brandon Elam Barker"; - }; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -1702,6 +1702,11 @@ github = "ilya-kolpakov"; name = "Ilya Kolpakov"; }; + imalison = { + email = "IvanMalison@gmail.com"; + github = "IvanMalison"; + name = "Ivan Malison"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; From 53138130f837540d6a4f1de84f9c2527c61e2029 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 11 Jun 2018 19:21:51 -0700 Subject: [PATCH 011/312] git-sync: init at 20151024 --- .../git-and-tools/git-sync/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-sync/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix new file mode 100644 index 000000000000..7ba7d8ec2434 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +}: + +stdenv.mkDerivation rec { + name = "git-sync-${version}"; + version = "20151024"; + + src = fetchFromGitHub { + owner = "simonthum"; + repo = "git-sync"; + rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; + sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a git-sync $out/bin/git-sync + ''; + + wrapperPath = with stdenv.lib; makeBinPath [ + coreutils + git + gnugrep + gnused + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/git-sync \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to automatically synchronize a git repository"; + homepage = https://github.com/simonthum/git-sync; + maintainers = with stdenv.lib.maintainers; [ imalison ]; + license = stdenv.lib.licenses.cc0; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2b28d0207d3..e9596e940e36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16106,6 +16106,8 @@ with pkgs; python = python27; }; + git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { }; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; From 8b9559e417f529138449a1a80aeed7c3fa449d7f Mon Sep 17 00:00:00 2001 From: Notkea Date: Sun, 10 Jun 2018 16:25:01 +0200 Subject: [PATCH 012/312] cgit: parametrise subdirectory This proposal enables the user to choose the sub-directory in which to serve cgit. The previous default behaviour isn't altered. --- .../services/web-servers/lighttpd/cgit.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index 710fecc0c05c..e6a054c296dc 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -4,8 +4,15 @@ with lib; let cfg = config.services.lighttpd.cgit; + pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir; configFile = pkgs.writeText "cgitrc" '' + # default paths to static assets + css=${pathPrefix}/cgit.css + logo=${pathPrefix}/cgit.png + favicon=${pathPrefix}/favicon.ico + + # user configuration ${cfg.configText} ''; in @@ -18,8 +25,17 @@ in type = types.bool; description = '' If true, enable cgit (fast web interface for git repositories) as a - sub-service in lighttpd. cgit will be accessible at - http://yourserver/cgit + sub-service in lighttpd. + ''; + }; + + subdir = mkOption { + default = "cgit"; + example = ""; + type = types.str; + description = '' + The subdirectory in which to serve cgit. The web application will be + accessible at http://yourserver/''${subdir} ''; }; @@ -48,14 +64,14 @@ in services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ]; services.lighttpd.extraConfig = '' - $HTTP["url"] =~ "^/cgit" { + $HTTP["url"] =~ "^/${cfg.subdir}" { cgi.assign = ( "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi" ) alias.url = ( - "/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", - "/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", - "/cgit" => "${pkgs.cgit}/cgit/cgit.cgi" + "${pathPrefix}/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", + "${pathPrefix}/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", + "${pathPrefix}" => "${pkgs.cgit}/cgit/cgit.cgi" ) setenv.add-environment = ( "CGIT_CONFIG" => "${configFile}" From 4ca2daae8f21834424f5d4055c85dbcf5765fc1d Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Tue, 20 Feb 2018 22:48:31 -0500 Subject: [PATCH 013/312] hplip: 3.18.3 -> 3.18.5 Also fixes multiples issues: - broken plugins: - `fax_marvell.so file is not present or symbolic link is missing` - `lj.so library file doesn't have user/group execute permission.` - `bb_escl.so file is not present or symbolic link is missing` - multiple error during configuration phase which prevented `*.ppd` generation: - `ppdc: Unable to find include file ""` - patched configure time `perl` script - patched use of `file` - some potentially problematic filter and services: - patched reference to ghost script and fonts dir in filter. - patched usb configuration service. - patch scripts so that they refer to valid location. Add some options: - `withStaticPPDInstall`: Install `*.ppd` files along with `*.drv`. When true, configure outputs: `checking for cups ppd install... yes`. --- pkgs/misc/drivers/hplip/default.nix | 43 +++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 91be6cf743a4..4b88d4a96fa0 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchurl, substituteAll , pkgconfig , makeWrapper -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, polkit, nettools +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, dbus, file, ghostscript, usbutils +, net_snmp, openssl, perl, polkit, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false +, withStaticPPDInstall ? false }: let name = "hplip-${version}"; - version = "3.18.3"; + version = "3.18.5"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; + sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; + sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; }; hplipState = substituteAll { @@ -55,8 +57,11 @@ pythonPackages.buildPythonApplication { libusb1 sane-backends dbus + file + ghostscript net_snmp openssl + perl zlib ]; @@ -86,6 +91,11 @@ pythonPackages.buildPythonApplication { -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ -e s,/var/lib/hp,$out/var/lib/hp,g \ + -e s,/usr/bin/perl,${perl}/bin/perl,g \ + -e s,/usr/bin/file,${file}/bin/file,g \ + -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ + -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ {} + ''; @@ -98,6 +108,7 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 ${stdenv.lib.optionalString withQt5 "--enable-qt5"} " @@ -111,10 +122,20 @@ pythonPackages.buildPythonApplication { hplip_confdir=$out/etc/hp hplip_statedir=$out/var/lib/hp " + + # Prevent 'ppdc: Unable to find include file ""' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + export CUPS_DATADIR="${cups}/share/cups" ''; enableParallelBuilding = true; + # + # Running `hp-diagnose_plugin -g` can be used to diagnose + # issues with plugins. + # postInstall = stdenv.lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp @@ -130,17 +151,27 @@ pythonPackages.buildPythonApplication { mkdir -p $out/share/hplip/prnt/plugins for plugin in lj hbpl1; do cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ $out/share/hplip/prnt/plugins/$plugin.so done mkdir -p $out/share/hplip/scan/plugins - for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + for plugin in bb_soap bb_marvell bb_soapht bb_escl; do cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ $out/share/hplip/scan/plugins/$plugin.so done + mkdir -p $out/share/hplip/fax/plugins + for plugin in fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins + chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/fax/plugins/$plugin.so + done + mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state From c21051dcf8499ffa8c2461160c81331dc377c786 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 14 Jun 2018 14:58:48 +0200 Subject: [PATCH 014/312] skydive: init at 0.17.0 --- pkgs/tools/networking/skydive/default.nix | 45 + pkgs/tools/networking/skydive/deps.nix | 1335 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1382 insertions(+) create mode 100644 pkgs/tools/networking/skydive/default.nix create mode 100644 pkgs/tools/networking/skydive/deps.nix diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix new file mode 100644 index 000000000000..ce2a8cf6a7f3 --- /dev/null +++ b/pkgs/tools/networking/skydive/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: + +buildGoPackage rec { + name = "skydive-${version}"; + version = "0.17.0"; + goPackagePath = "github.com/skydive-project/skydive"; + + src = fetchFromGitHub { + owner = "skydive-project"; + repo = "skydive"; + rev = "v${version}"; + sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace ".proto: builddep" ".proto: " \ + --replace ".bindata: builddep" ".bindata: " + ''; + + buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ]; + goDeps = ./deps.nix; + + preBuild = '' + make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version} + ''; + + preInstall = '' + mkdir -p $out/share/skydive + cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/ + ''; + + postInstall = '' + rm $bin/bin/snort + ''; + + meta = { + homepage = http://skydive.network; + description = "A real-time network analyzer"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.lewo ]; + }; +} diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix new file mode 100644 index 000000000000..c573a7231bb6 --- /dev/null +++ b/pkgs/tools/networking/skydive/deps.nix @@ -0,0 +1,1335 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "fff283ad5116362ca252298cfc9b95828956d85d"; + sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "fd18e053af8a4ff11039269006e8037ff374ce0e"; + sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b"; + sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/abbot/go-http-auth"; + fetch = { + type = "git"; + url = "https://github.com/abbot/go-http-auth"; + rev = "ca62df34b58d26b6a064246c21c0a18f97813173"; + sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n"; + }; + } + { + goPackagePath = "github.com/araddon/gou"; + fetch = { + type = "git"; + url = "https://github.com/araddon/gou"; + rev = "0c2ab7394d785afff14c983fedce4be70ccc431f"; + sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; + sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; + sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; + }; + } + { + goPackagePath = "github.com/cenk/hub"; + fetch = { + type = "git"; + url = "https://github.com/cenk/hub"; + rev = "11382a9960d39b0ecda16fd01c424c11ff765a34"; + sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm"; + }; + } + { + goPackagePath = "github.com/cenk/rpc2"; + fetch = { + type = "git"; + url = "https://github.com/cenk/rpc2"; + rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2"; + sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8"; + }; + } + { + goPackagePath = "github.com/cnf/structhash"; + fetch = { + type = "git"; + url = "https://github.com/cnf/structhash"; + rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc"; + sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + }; + } + { + goPackagePath = "github.com/coreos/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/coreos/bbolt"; + rev = "32c383e75ce054674c53b5a07e55de85332aee14"; + sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94"; + sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a"; + sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"; + sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "325b0804fef3a66309d962357aac3c2ce3f4d329"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88"; + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; + sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; + sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful-swagger12"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful-swagger12"; + rev = "7524189396c68dc4b04d53852f9edc00f816b123"; + sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63"; + sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gima/govalid"; + fetch = { + type = "git"; + url = "https://github.com/gima/govalid"; + rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6"; + sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; + sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "36d33bfe519efae5632669801b180bf1a245da3b"; + sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "7abd5745472fff5eb3685386d5fb8bf38683154d"; + sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c"; + sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "32dbaa12caca20fad12253c30591227e04f62cdd"; + sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "915eed3240022c5265584c55032ef1b8c8f84168"; + sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "2adc21fd136931e0388e278825291678e1d98309"; + sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "cc6329d4279e3f025a53a83c397d2339b5705c45"; + sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "67a21c4470a0598531a769727aef40b870ffa128"; + sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "41d03372f44f2bc18a72c97615a669fb60e7452a"; + sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "849a2e71dd64dbfa2bd4be110ace68881802414b"; + sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "90663712d74cb411cbef281bc1e08c19d1a76145"; + sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"; + sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "cdedf21e585dae942951e34d6defc3215b4280fa"; + sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv"; + }; + } + { + goPackagePath = "github.com/gosuri/uitable"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uitable"; + rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229"; + sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0"; + sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104"; + sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/hydrogen18/stoppableListener"; + fetch = { + type = "git"; + url = "https://github.com/hydrogen18/stoppableListener"; + rev = "dadc9ccc400c712e5a316107a5c462863919e579"; + sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; + sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/intel-go/yanff"; + fetch = { + type = "git"; + url = "https://github.com/intel-go/yanff"; + rev = "35804adce65005f76409327527e4e256569cacc6"; + sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh"; + }; + } + { + goPackagePath = "github.com/iovisor/gobpf"; + fetch = { + type = "git"; + url = "https://github.com/iovisor/gobpf"; + rev = "dd767a9fd5f868874ed117811461410100cea403"; + sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3"; + }; + } + { + goPackagePath = "github.com/jbowtie/gokogiri"; + fetch = { + type = "git"; + url = "https://github.com/jbowtie/gokogiri"; + rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c"; + sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "ed104f61ea4877bea08af6f759805674861e968d"; + sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88"; + sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"; + sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; + sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + }; + } + { + goPackagePath = "github.com/juju/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/juju/webbrowser"; + rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507"; + sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d1898390779332322e6b5ca5011da4bf249bb056"; + sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; + sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b"; + sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc"; + }; + } + { + goPackagePath = "github.com/lxc/lxd"; + fetch = { + type = "git"; + url = "https://github.com/lxc/lxd"; + rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6"; + sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19"; + sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d"; + sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3"; + }; + } + { + goPackagePath = "github.com/mattbaird/elastigo"; + fetch = { + type = "git"; + url = "https://github.com/safchain/elastigo"; + rev = "441c1531dca50a19990385930149f6785f78fe59"; + sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda"; + sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn"; + }; + } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799"; + sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/nlewo/contrail-introspect-cli"; + fetch = { + type = "git"; + url = "https://github.com/nlewo/contrail-introspect-cli"; + rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6"; + sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "8fa5343b0058459296399a89bc532aa5508de28d"; + sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943"; + sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "2973218375c3d13162e1d3afe1708aaee318ef3f"; + sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073"; + sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; + sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/pmylund/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/pmylund/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568"; + sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "23070236b1ebff452f494ae831569545c2b61d26"; + sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/rogpeppe/fastuuid"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/fastuuid"; + rev = "6724a57986aff9bff1a1770e9347036def7c89f6"; + sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "e01512671ed4c2248daf0c5e974ecf88a4947335"; + sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255"; + sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk"; + }; + } + { + goPackagePath = "github.com/skydive-project/dede"; + fetch = { + type = "git"; + url = "https://github.com/skydive-project/dede"; + rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80"; + sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf"; + }; + } + { + goPackagePath = "github.com/socketplane/libovsdb"; + fetch = { + type = "git"; + url = "https://github.com/socketplane/libovsdb"; + rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272"; + sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "a80ea588265c05730645be8342eeafeaa72b2923"; + sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "d00654080cddbd2b082acaa74007cb94a2b40866"; + sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/lebauce/viper"; + rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3"; + sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb"; + }; + } + { + goPackagePath = "github.com/tchap/zapext"; + fetch = { + type = "git"; + url = "https://github.com/tchap/zapext"; + rev = "e61c0c8823393722ae09ce0faee42fa177088a4b"; + sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr"; + }; + } + { + goPackagePath = "github.com/tebeka/selenium"; + fetch = { + type = "git"; + url = "https://github.com/tebeka/selenium"; + rev = "657e45ec600f26e76da253936c1f2adb6978ff72"; + sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"; + sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "016ba6f67a12c03708643150afcfb1509be7747a"; + sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "604eaf189ee867d8c147fafc28def2394e878d25"; + sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7"; + }; + } + { + goPackagePath = "github.com/weaveworks/tcptracer-bpf"; + fetch = { + type = "git"; + url = "https://github.com/weaveworks/tcptracer-bpf"; + rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf"; + sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "6fe8760cad3569743d51ddbb243b26f8456742dc"; + sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; + sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "702b404897d4364af44dc8dcabc9815947942325"; + sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr"; + }; + } + { + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a775f18c7cfe02273500ae307b61218"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "0506d69f5564c56e25797bf7183c28921d4c6360"; + sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "35aad584952c3e7020db7b839f6b102de6271f89"; + sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a6577fac2d73be281a500b310739095313165611"; + sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "810d7000345868fc619eb81f46307107118f4ae1"; + sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; + sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7"; + sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"; + sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v1"; + rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3"; + sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/httprequest.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/httprequest.v1"; + rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718"; + sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/macaroon-bakery.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon-bakery.v2"; + rev = "22c04a94d902625448265ef041bb53e715452a40"; + sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4"; + }; + } + { + goPackagePath = "gopkg.in/macaroon.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon.v2"; + rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"; + sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536"; + sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/urfave/cli.v2"; + rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1"; + sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3"; + }; + } + { + goPackagePath = "gopkg.in/validator.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/validator.v2"; + rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448"; + sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "bef53efd0c76e49e6de55ead051f886bea7e9420"; + sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad"; + sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "019ae5ada31de202164b118aee88ee2d14075c31"; + sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "35ccd4336052e7d73018b1382413534936f34eee"; + sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"; + sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94ebd20a0f5b..c4d992bd6f04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11642,6 +11642,8 @@ with pkgs; skalibs = callPackage ../development/libraries/skalibs { }; + skydive = callPackage ../tools/networking/skydive { }; + slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { From 499f6a3ff3cdb8e40ebd4454eff2e4f9f2aa136b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 15 Jun 2018 23:06:16 +0000 Subject: [PATCH 015/312] hadoop: update minor versions --- .../networking/cluster/hadoop/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 8c8e258ccd10..768712a3b673 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -124,27 +124,33 @@ let in { hadoop_2_7 = common { - version = "2.7.5"; - sha256 = "0dvgi4z2pi45b0yzzm9zxjp0lwvd8lwqn4903mxlqh7xv2g3llnp"; - dependencies-sha256 = "137v077q022997ih41n412l2xq4ynypk5dl5p4n16i16745k9lk2"; + version = "2.7.6"; + sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; }; hadoop_2_8 = common { - version = "2.8.3"; - sha256 = "0ziairmgfi05iqmib66lysanlabrp1cq6palnmwkiss098b5dcjd"; - dependencies-sha256 = "1qmdmiprr0l0i0q3w9nv964db5cm3615iqczywrs5v8qaaf580b3"; + version = "2.8.4"; + sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; + dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; tomcat = tomcat_6_0_48; }; hadoop_2_9 = common { - version = "2.9.0"; - sha256 = "03mh193bccm4bi7cq6ym651zal82d0kvl00yhnzzrsnwq10j2h62"; - dependencies-sha256 = "0773lw4d03r89dcrrsglbr4zgcz2m9b15587nxdz4clm2f5gqiw5"; + version = "2.9.1"; + sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; + dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; tomcat = tomcat_6_0_48; }; hadoop_3_0 = common { - version = "3.0.0"; - sha256 = "0h22mdpgvg9v4rbc8gn4m8vrpkq45lwk7m8f5c25fvnzdyrc8fzc"; - dependencies-sha256 = "0ghbl768al3wpgz0rx2mqbnf6p7cdqpkq6yk6hgf65b4qab4aw9v"; + version = "3.0.3"; + sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5"; + dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m"; + tomcat = null; + }; + hadoop_3_1 = common { + version = "3.1.0"; + sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; + dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; tomcat = null; }; } From 50bf6f4a9c18790689088a2927fc7fdbf849e47d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 15 Jun 2018 23:07:23 +0000 Subject: [PATCH 016/312] hadoop_3_1: init at 3.1.0 --- 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 019f9c29ec8d..8313e1f199e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6590,7 +6590,8 @@ with pkgs; hadoop_2_7 hadoop_2_8 hadoop_2_9 - hadoop_3_0; + hadoop_3_0 + hadoop_3_1; hadoop = hadoop_2_7; io = callPackage ../development/interpreters/io { }; From 441796cb16e0b97c0ddcf947c6c90d86c1118b3f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 17 Jun 2018 23:29:16 +0300 Subject: [PATCH 017/312] lib/modules: bump mkOptionDefault priority to 1500 --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index 8baae4917053..8339d4b545ef 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -493,7 +493,7 @@ rec { inherit priority content; }; - mkOptionDefault = mkOverride 1001; # priority of option defaults + mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ From b6eeeb111c6704c9f0f15f072351330c5af261b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 21 Jun 2018 13:04:24 +0200 Subject: [PATCH 018/312] opensmtpd package and module: add nixos test --- nixos/release.nix | 1 + nixos/tests/opensmtpd.nix | 115 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 nixos/tests/opensmtpd.nix diff --git a/nixos/release.nix b/nixos/release.nix index 9b4aa4b0399d..52358b986c4a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -331,6 +331,7 @@ in rec { tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.openldap = callTest tests/openldap.nix {}; + tests.opensmtpd = callTest tests/opensmtpd.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix new file mode 100644 index 000000000000..5079779f35b4 --- /dev/null +++ b/nixos/tests/opensmtpd.nix @@ -0,0 +1,115 @@ +import ./make-test.nix { + name = "opensmtpd"; + + nodes = { + smtp1 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + # DO NOT DO THIS IN PRODUCTION! + # Setting up authentication requires a certificate which is painful in + # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A + # WELL-CONTROLLED ENVIRONMENT! + accept from any for any relay + ''; + }; + }; + + smtp2 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + accept from any for local deliver to mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + client = { pkgs, ... }: { + networking = { + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-a-test-mail" '' + #!${pkgs.python3.interpreter} + import smtplib, sys + + with smtplib.SMTP('192.168.1.1') as smtp: + smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + From: alice@smtp1 + To: bob@smtp2 + Subject: Test + + Hello World + """) + ''; + + checkMailLanded = pkgs.writeScriptBin "check-mail-landed" '' + #!${pkgs.python3.interpreter} + import imaplib + + with imaplib.IMAP4('192.168.1.2', 143) as imap: + imap.login('bob', 'foobar') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + content = msg[0][1] + print("===> content:", content) + split = content.split(b'\r\n') + print("===> split:", split) + lastline = split[-3] + print("===> lastline:", lastline) + assert lastline.strip() == b'Hello World' + ''; + in [ sendTestMail checkMailLanded ]; + }; + }; + + testScript = '' + startAll; + + $client->waitForUnit("network.target"); + $smtp1->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('dovecot2'); + + $client->succeed('send-a-test-mail'); + $smtp1->waitUntilFails('smtpctl show queue | egrep .'); + $smtp2->waitUntilFails('smtpctl show queue | egrep .'); + $client->succeed('check-mail-landed >&2'); + ''; +} From 1b187b3961832451abed4261af82a3e68e8e80e5 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Wed, 20 Jun 2018 10:44:40 -0400 Subject: [PATCH 019/312] luxcorerender: init at 2.0, embree: init at 2.17.4 --- pkgs/development/libraries/embree/2.x.nix | 27 ++++++ pkgs/tools/graphics/luxcorerender/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 118 insertions(+) create mode 100644 pkgs/development/libraries/embree/2.x.nix create mode 100644 pkgs/tools/graphics/luxcorerender/default.nix diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix new file mode 100644 index 000000000000..c973c2bd9449 --- /dev/null +++ b/pkgs/development/libraries/embree/2.x.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +openimageio, libjpeg, libpng, libpthreadstubs, libX11 +}: + +stdenv.mkDerivation rec { + name = "embree-${version}"; + version = "2.17.4"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v2.17.4"; + sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9"; + }; + + cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; + enableParallelBuilding = true; + + buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + meta = with stdenv.lib; { + description = "High performance ray tracing kernels from Intel"; + homepage = https://embree.github.io/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix new file mode 100644 index 000000000000..387c8c0595e7 --- /dev/null +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase +, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core +, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, bison, flex, libpthreadstubs, libX11 +, embree2, makeWrapper, gsettings_desktop_schemas, glib +, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp +}: + +let boost_static = boost165.override { + python = python35; + enableStatic = true; + }; + +in stdenv.mkDerivation rec { + name = "luxcorerender-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "LuxCoreRender"; + repo = "LuxCore"; + rev = "luxcorerender_v2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + }; + + buildInputs = + [ embree2 pkgconfig cmake zlib boost_static libjpeg + libtiff libpng ilmbase freetype openexr openimageio + tbb qt5.full c-blosc mesa_glu pcre bison + flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + epoxy at-spi2-core dbus doxygen + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gnome3.gtk + # needed for XDG_ICON_DIRS + gnome3.defaultIconTheme + makeWrapper + (stdenv.lib.getLib gnome3.dconf) + ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; + + cmakeFlags = [ + "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" + "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" + "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DEMBREE_INCLUDE_PATH=${embree2}/include" + "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" + "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" + ] ++ stdenv.lib.optional withOpenCL + "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_LDFLAGS+=" -lpython3" + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + cp -va bin/* $out/bin + cp -va lib/* $out/lib + ''; + + preFixup = '' + wrapProgram "$out/bin/luxcoreui" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Open source, physically based, unbiased rendering engine"; + homepage = https://luxcorerender.org/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} + + +# TODO (might not be necessary): +# +# luxcoreui still gives warnings like: "failed to commit changes to +# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The +# name ca.desrt.dconf was not provided by any .service files" + +# CMake complains of the FindOpenGL/GLVND preference diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e667e6d6843c..af2a63e5aafd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2227,6 +2227,8 @@ with pkgs; callPackage ../servers/search/elasticsearch/plugins.nix { } ); + embree2 = callPackage ../development/libraries/embree/2.x.nix { }; + emem = callPackage ../applications/misc/emem { }; emv = callPackage ../tools/misc/emv { }; @@ -3690,6 +3692,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; From fac82deb6e1779ba557358dc788999a70ef340eb Mon Sep 17 00:00:00 2001 From: Sander Hollaar Date: Thu, 21 Jun 2018 19:52:58 +0200 Subject: [PATCH 020/312] google-authenticator-failed-to-use-libqrencode - use libqrencode 4 --- pkgs/os-specific/linux/google-authenticator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 41bdd5d12ac3..4e04c16d70bd 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; preConfigure = '' - sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c + sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c ''; installPhase = '' From a15d3101680d4a8e98022afecc97fb93e9a1756f Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Wed, 6 Jun 2018 13:34:08 -0500 Subject: [PATCH 021/312] documentation: add sub-section for the nixpkgs manual Haskell section --- doc/languages-frameworks/haskell.section.md | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 3b8971c295bb..c740f0d6df64 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -716,6 +716,62 @@ sets at once: } ``` +### How to specify source overrides for your Haskell package + +When starting a Haskell project you can use `developPackage` +to define a derivation for your package at the `root` path +as well as source override versions for Hackage packages, like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + HUnit = "1.5.0.0"; + }; + }; +in pkg +``` + +This could be used in place of a simplified `stack.yaml` defining a Nix +derivation for your Haskell package. + +As you can see this allows you to specify only the source version found on +Hackage and nixpkgs will take care of the rest. + +You can also specify `buildInputs` for your Haskell derivation for packages +that directly depend on external libraries like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + HUnit = "1.5.0.0"; # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + }; + }; + # in case your package source depends on any libraries directly, not just transitively. + buildInputs = [ zlib ]; +in pkg.overrideAttrs(attrs: { + buildInputs = attrs.buildInputs ++ buildInputs; +}) +``` + +Notice that you will need to override (via `overrideAttrs` or similar) the +derivation returned by the `developPackage` Nix lambda as there is no `buildInputs` +named argument you can pass directly into the `developPackage` lambda. + ### How to recover from GHC's infamous non-deterministic library ID bug GHC and distributed build farms don't get along well: From 3b880f55b5776b339310fddc6344b4cdc48e6871 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Wed, 20 Jun 2018 14:42:10 -0400 Subject: [PATCH 022/312] appleseed: init at 1.9.0-beta, osl: init at 1.9.9, seexpr: init at 2.11 --- pkgs/development/compilers/osl/default.nix | 39 +++++++++++ pkgs/development/compilers/seexpr/default.nix | 23 +++++++ pkgs/tools/graphics/appleseed/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 4 files changed, 134 insertions(+) create mode 100644 pkgs/development/compilers/osl/default.nix create mode 100644 pkgs/development/compilers/seexpr/default.nix create mode 100644 pkgs/tools/graphics/appleseed/default.nix diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix new file mode 100644 index 000000000000..65d8110646f8 --- /dev/null +++ b/pkgs/development/compilers/osl/default.nix @@ -0,0 +1,39 @@ +{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr, +openimageio, llvm, boost165, flex, bison, partio, pugixml, +utillinux, python +}: + +let boost_static = boost165.override { enableStatic = true; }; +in clangStdenv.mkDerivation rec { + # In theory this could use GCC + Clang rather than just Clang, + # but https://github.com/NixOS/nixpkgs/issues/29877 stops this + name = "openshadinglanguage-${version}"; + version = "1.9.9"; + + src = fetchFromGitHub { + owner = "imageworks"; + repo = "OpenShadingLanguage"; + rev = "Release-1.9.9"; + sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn"; + }; + + cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; + enableParallelBuilding = true; + + preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; + + buildInputs = [ + cmake zlib openexr openimageio llvm + boost_static flex bison partio pugixml + utillinux # needed just for hexdump + python # CMake doesn't check this? + ]; + # TODO: How important is partio? CMake doesn't seem to find it + meta = with stdenv.lib; { + description = "Advanced shading language for production GI renderers"; + homepage = http://opensource.imageworks.com/?p=osl; + maintainers = with maintainers; [ hodapp ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix new file mode 100644 index 000000000000..2760d6ad5d03 --- /dev/null +++ b/pkgs/development/compilers/seexpr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, +bison, flex, mesa_glu, pythonPackages +}: + +stdenv.mkDerivation rec { + name = "seexpr-${version}"; + version = "2.11"; + src = fetchFromGitHub { + owner = "wdas"; + repo = "SeExpr"; + rev = "v2.11"; + sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; + }; + + buildInputs = [ cmake mesa_glu libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + meta = with stdenv.lib; { + description = "Embeddable expression evaluation engine from Disney Animation"; + homepage = https://www.disneyanimation.com/technology/seexpr.html; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix new file mode 100644 index 000000000000..e4b31f06b6e4 --- /dev/null +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, +eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +opencolorio, xercesc, ilmbase, osl, seexpr +}: + +let boost_static = boost165.override { enableStatic = true; }; +in stdenv.mkDerivation rec { + + name = "appleseed-${version}"; + version = "1.9.0-beta"; + + src = fetchFromGitHub { + owner = "appleseedhq"; + repo = "appleseed"; + rev = "1.9.0-beta"; + sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; + }; + buildInputs = [ + cmake pkgconfig boost_static guile eigen3_3 libpng python + mesa_glu qt4 openexr openimageio opencolorio xercesc + osl seexpr + ]; + + NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO"; + + cmakeFlags = [ + "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" + "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON" + "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" + "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" + "-DWITH_PYTHON2_BINDINGS=ON" + # TODO: Look further into this if someone needs Python 3.x: + # "-DWITH_PYTHON3_BINDINGS=ON" + "-DWITH_DISNEY_MATERIAL=ON" + "-DUSE_SSE=ON" + "-DUSE_SSE42=ON" + ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source, physically-based global illumination rendering engine"; + homepage = https://appleseedhq.net/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} + +# TODO: Is the below problematic? + +# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message): +# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when +# available. Run "cmake --help-policy CMP0072" for policy details. Use the +# cmake_policy command to set the policy and suppress this warning. +# +# FindOpenGL found both a legacy GL library: +# +# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so +# +# and GLVND libraries for OpenGL and GLX: +# +# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so +# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so +# +# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for +# compatibility with CMake 3.10 and below the legacy GL library will be used. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e667e6d6843c..e83867484524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1501,6 +1501,8 @@ with pkgs; appdata-tools = callPackage ../tools/misc/appdata-tools { }; + appleseed = callPackage ../tools/graphics/appleseed { }; + arping = callPackage ../tools/networking/arping { }; arpoison = callPackage ../tools/networking/arpoison { }; @@ -4263,6 +4265,8 @@ with pkgs; os-prober = callPackage ../tools/misc/os-prober {}; + osl = callPackage ../development/compilers/osl { }; + ossec = callPackage ../tools/security/ossec {}; ostree = callPackage ../tools/misc/ostree { }; @@ -4945,6 +4949,8 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; + seexpr = callPackage ../development/compilers/seexpr { }; + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; From d395b185d92776878d1c23fbeaddfc72f948c647 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 22 Jun 2018 16:43:33 +0900 Subject: [PATCH 023/312] i3ipc-glib: init at 0.6.0 IPC library used to interact with the window manager www.i3wm.org --- .../window-managers/i3/i3ipc-glib.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/i3ipc-glib.nix diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix new file mode 100644 index 000000000000..87e11774d43b --- /dev/null +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb +, autoreconfHook, json-glib, gtk-doc, which +, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + + name = "i3ipc-glib-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-glib"; + rev = "v${version}"; + sha256 = "1gmk1zjafrn6jh4j7r0wkwrpwvf9drl1lcw8vya23i1f4zbk0wh4"; + }; + + nativeBuildInputs = [ autoreconfHook which pkgconfig ]; + + buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ]; + + + preAutoreconf = '' + gtkdocize + ''; + + meta = with stdenv.lib; { + description = "A C interface library to i3wm"; + homepage = https://github.com/acrisci/i3ipc-glib; + maintainers = with maintainers; [teto]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d63580c89c1..52d5cb71cc14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16460,6 +16460,8 @@ with pkgs; i3cat = callPackage ../tools/misc/i3cat { }; + i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { }; + i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; }; From 6664babe85ecd888af441350b798778d725ff1d6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 22 Jun 2018 16:44:53 +0900 Subject: [PATCH 024/312] i3-easyfocus: init at 20180622 Fast window switcher. Attributes and display one letter per window on your current workspace, upon keypress, will focus the matching window. --- .../window-managers/i3/easyfocus.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/easyfocus.nix diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix new file mode 100644 index 000000000000..337ecdd651ff --- /dev/null +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms +, xlibs , i3ipc-glib , glib +}: + +stdenv.mkDerivation rec { + name = "i3easyfocus-${version}"; + version = "20180622"; + + src = fetchFromGitHub { + owner = "cornerman"; + repo = "i3-easyfocus"; + rev = "3631d5af612d58c3d027f59c86b185590bd78ae1"; + sha256 = "1wgknmmm7iz0wxsdh29gmx4arizva9101pzhnmac30bmixf3nzhr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ]; + + # Makefile has no rule for 'install' + installPhase = '' + mkdir -p $out/bin + cp i3-easyfocus $out/bin + ''; + + meta = with stdenv.lib; { + description = "Focus and select windows in i3"; + homepage = https://github.com/cornerman/i3-easyfocus; + maintainers = with maintainers; [teto]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52d5cb71cc14..cfa4adecdccf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16454,6 +16454,8 @@ with pkgs; i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; From 6f831a7ab48607d6cf62684099e10443524c8b88 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 21 Jun 2018 13:08:26 +0200 Subject: [PATCH 025/312] Gnome-latex: init at 3.28.1 --- .../editors/gnome-latex/default.nix | 47 +++++++++++++++++++ pkgs/development/libraries/amtk/default.nix | 40 ++++++++++++++++ pkgs/development/libraries/tepl/default.nix | 42 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 4 files changed, 135 insertions(+) create mode 100644 pkgs/applications/editors/gnome-latex/default.nix create mode 100644 pkgs/development/libraries/amtk/default.nix create mode 100644 pkgs/development/libraries/tepl/default.nix diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix new file mode 100644 index 000000000000..4657d0d10ad8 --- /dev/null +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, wrapGAppsHook +, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +let + version = "3.28.1"; + pname = "gnome-latex"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + configureFlags = ["--disable-dconf-migration"]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + itstool + intltool + ]; + + buildInputs = with gnome3; [ + amtk + defaultIconTheme + glib + gsettings-desktop-schemas + gspell + gtksourceview4 + libgee + libxml2 + tepl + ]; + + doCheck = true; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX; + description = "A LaTeX editor for the GNOME desktop"; + maintainers = [ maintainers.manveru ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix new file mode 100644 index 000000000000..2487711d9b15 --- /dev/null +++ b/pkgs/development/libraries/amtk/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, pkgconfig, gnome3, dbus, xvfb_run }: +let + version = "4.99.1"; + pname = "amtk"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00fhvw5y638z584s8cfdslh47ngfzcgx4f0b0456sw8p754j3f8d"; + }; + + nativeBuildInputs = [ + pkgconfig + dbus + ]; + + buildInputs = [ + gnome3.gtk + ]; + + doCheck = stdenv.isLinux; + checkPhase = '' + export NO_AT_BRIDGE=1 + ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Amtk; + description = "Actions, Menus and Toolbars Kit for GTK+ applications"; + maintainers = [ maintainers.manveru ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix new file mode 100644 index 000000000000..12f953b1aa8d --- /dev/null +++ b/pkgs/development/libraries/tepl/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl +, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: +let + version = "4.1.1"; + pname = "tepl"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "13kflywpc6iyfpc9baaa54in5vzn4p7i3dh9pr2ival2nkxfnkp2"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + amtk + libxml2 + gtksourceview4 + libuchardet + gnome3.gtk + ]; + + doCheck = false; + # TODO: one test fails because of + # (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata + # is not supported. Fallback to TeplMetadataManager. Either GVfs is not + # correctly installed or GVfs metadata are not supported on this platform. In + # the latter case, you should configure Tepl with --disable-gvfs-metadata. + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tepl; + description = "Text editor product line"; + maintainers = [ maintainers.manveru ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd778deea95d..bb4ba9232755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7574,6 +7574,8 @@ with pkgs; samples = true; }; + amtk = callPackage ../development/libraries/amtk { }; + avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc"; avrbinutils = callPackage ../development/misc/avr/binutils {}; @@ -8055,6 +8057,8 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; + gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; @@ -11841,6 +11845,8 @@ with pkgs; tectonic = callPackage ../tools/typesetting/tectonic { }; + tepl = callPackage ../development/libraries/tepl { }; + telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; From 4d728b19f7dc44c37d88b1a70dc40109d05f9f78 Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Fri, 22 Jun 2018 14:38:08 +0100 Subject: [PATCH 026/312] pythonPackages.sklearn-deap: init at 0.2.2 --- .../python-modules/sklearn-deap/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/sklearn-deap/default.nix diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix new file mode 100644 index 000000000000..2c40ce4c2fc3 --- /dev/null +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python }: + +buildPythonPackage rec { + pname = "sklearn-deap"; + version = "0.2.2"; + + # No tests in Pypi + src = fetchFromGitHub { + owner = "rsteca"; + repo = pname; + rev = "${version}"; + sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava"; + }; + + propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; + + #doCheck = false; + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with stdenv.lib; { + description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; + homepage = https://github.com/rsteca/sklearn-deap; + license = licenses.lgpl3; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d057cebf9f57..83af2a4a3107 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -464,6 +464,8 @@ in { sip = callPackage ../development/python-modules/sip { }; + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + spglib = callPackage ../development/python-modules/spglib { }; supervise_api = callPackage ../development/python-modules/supervise_api { }; From eb0e26101e4bd16f626129d35f04df9d39df54e5 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 22 Jun 2018 20:31:54 +0200 Subject: [PATCH 027/312] netpbm: update to 10.82.01 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index fcd347182ec4..05aa7b866360 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.77.02"; + name = "netpbm-10.82.01"; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = 2883; - sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f"; + rev = 3264; + sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; }; postPatch = /* CVE-2005-2471, from Arch */ '' From d9659c158046701a95176372a352b83018f527cd Mon Sep 17 00:00:00 2001 From: Victor Palma Date: Fri, 22 Jun 2018 13:30:58 -0500 Subject: [PATCH 028/312] font-awesome-5: update to version 5.1.0 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 6bb175f1ecac..77c2ed4d780c 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.0.6"; + version = "5.1.0"; in fetchzip rec { name = "font-awesome-${version}"; @@ -14,7 +14,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype ''; - sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + sha256 = "12m35bk61d8pddhybg2jpl5xv16dclz1qacdmk05m11nzshd3nz1"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; From 4ea4073c465f4bd821f2c608179f27154a54e576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Fri, 22 Jun 2018 22:20:57 +0200 Subject: [PATCH 029/312] freeradius : added service to module-list The freeradius service was merged with #34587 but the module was not added to module-list. This commit fixes that and enables the use of services.freeradius in nixos configuration. --- 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 193ef0d1c961..9114eae97f26 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -486,6 +486,7 @@ ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix + ./services/networking/freeradius.nix ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix From 28ff1f7565df70785321b56ae72c2985bfae2ffa Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 23 Jun 2018 09:23:24 -0400 Subject: [PATCH 030/312] =?UTF-8?q?multimc:=200.6.2=20=E2=86=92=20unstable?= =?UTF-8?q?-2018-06-04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #42387. See also #42351 for information on Qt breakage. --- pkgs/games/multimc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index c6697f5806d4..a497cf3b13cf 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,14 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - version = "0.6.2"; + # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see + # https://github.com/NixOS/nixpkgs/issues/42387 + version = "unstable-2018-06-04"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c"; + rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; + sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; From be47f95083dcb46376041109235840bd584715dd Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 23 Jun 2018 09:35:59 -0400 Subject: [PATCH 031/312] multimc: create compatibility symlink to fix desktop icon --- pkgs/games/multimc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index a497cf3b13cf..6be5c9ee2474 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -24,6 +24,12 @@ in stdenv.mkDerivation rec { cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps cp ../application/package/linux/multimc.desktop $out/share/applications wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ + + # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop, + # the desktop icon refers to `multimc`, but the executable actually gets + # installed as `MultiMC`. Create compatibility symlink to fix the desktop + # icon. + ln -sf $out/bin/MultiMC $out/bin/multimc ''; meta = with stdenv.lib; { From 56670875815ac885f39b3cf246f2287587bd58a7 Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Sat, 23 Jun 2018 17:04:21 +0200 Subject: [PATCH 032/312] epkowa: added Perfection V500 support --- pkgs/misc/drivers/epkowa/default.nix | 31 +++++++++++++++++++ .../drivers/epkowa/firmware_location.patch | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 1c79be712b06..e01967019943 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -25,6 +25,37 @@ in # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... let plugins = { + x770 = stdenv.mkDerivation rec { + name = "iscan-gt-x770-bundle"; + version = "1.0.1"; + pluginVersion = "2.1.2-1"; + + buildInputs = [ patchelf rpm ]; + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + preFixup = '' + lib=$out/lib/esci/libesint7C.so + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $lib + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" + ''; + hw = "Perfection V500 Photo"; + }; + }; f720 = stdenv.mkDerivation rec { name = "iscan-gt-f720-bundle"; version = "1.0.1"; diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch index 7f67d9cf4579..58ea849d8f9d 100644 --- a/pkgs/misc/drivers/epkowa/firmware_location.patch +++ b/pkgs/misc/drivers/epkowa/firmware_location.patch @@ -8,11 +8,12 @@ set this environment variable. Instead, we patch iscan to set this variable before loading libesci-interpreter-gt-f720.so. --- backend/channel-usb.c.orig 2017-08-14 11:24:27.669582456 +0200 +++ backend/channel-usb.c 2017-08-14 11:31:40.509010897 +0200 -@@ -169,6 +169,8 @@ +@@ -169,6 +169,9 @@ { SANE_Status s; + setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1); ++ setenv("ISCAN_FW_DIR", NIX_ESCI_PREFIX, 1); + s = sanei_usb_open (self->name, &self->fd); From d8bb4c3ffa9ceb4ba764e217a181f20dd7996b92 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Sun, 3 Jun 2018 21:35:17 +0200 Subject: [PATCH 033/312] Add myself as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d99ce88d61ef..bafb7f8c1183 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3906,6 +3906,11 @@ github = "tokudan"; name = "Daniel Frank"; }; + tomahna = { + email = "kevin.rauscher@tomahna.fr"; + github = "Tomahna"; + name = "Kevin Rauscher"; + }; tomberek = { email = "tomberek@gmail.com"; github = "tomberek"; From ead58d100d37fad39a915f1c56f5574c2f06018f Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Sun, 3 Jun 2018 21:48:05 +0200 Subject: [PATCH 034/312] bloop: init at 1.0.0-M11 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/development/bloop.nix | 37 +++++++++++ .../tools/build-managers/bloop/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 101 insertions(+) create mode 100644 nixos/modules/services/development/bloop.nix create mode 100644 pkgs/development/tools/build-managers/bloop/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193ef0d1c961..b88d8c1b3242 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -242,6 +242,7 @@ ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/development/bloop.nix ./services/development/hoogle.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix new file mode 100644 index 000000000000..56904b7c40e6 --- /dev/null +++ b/nixos/modules/services/development/bloop.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.bloop; + +in { + + options.services.bloop = { + install = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install a user service for the Bloop server. + + The service must be manually started for each user with + "systemctl --user start bloop". + ''; + }; + }; + + config = mkIf (cfg.install) { + systemd.user.services.bloop = { + description = "Bloop Scala build server"; + + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.bloop}/bin/blp-server''; + Restart = "always"; + }; + }; + + environment.systemPackages = [ pkgs.bloop ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix new file mode 100644 index 000000000000..96e9d0f9a439 --- /dev/null +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }: + +let + baseName = "bloop"; + version = "1.0.0-M11"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \ + -r "bintray:scalameta/maven" \ + -r "bintray:scalacenter/releases" \ + -r "https://oss.sonatype.org/content/repositories/staging" > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + nailgunCommit = "60c2d130"; + + buildInputs = [ jdk makeWrapper deps ]; + + phases = [ "installPhase" ]; + + client = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; + sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n"; + }; + + zshCompletion = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; + sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/zsh/site-functions + + cp ${client} $out/bin/blp-client + cp ${zshCompletion} $out/share/zsh/site-functions/_bloop + chmod +x $out/bin/blp-client + + makeWrapper ${jre}/bin/java $out/bin/blp-server \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "-cp $CLASSPATH bloop.Server" + makeWrapper $out/bin/blp-client $out/bin/bloop \ + --prefix PATH : ${lib.makeBinPath [ python ]} + ''; + + meta = with stdenv.lib; { + homepage = https://scalacenter.github.io/bloop/; + license = licenses.asl20; + description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; + maintainers = with maintainers; [ tomahna ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf2d83fe3fc..03ccb873d772 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7770,6 +7770,8 @@ with pkgs; bloaty = callPackage ../development/tools/bloaty { }; + bloop = callPackage ../development/tools/build-managers/bloop { }; + bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; From 1f0902ae69289e023d3f8dc108d390499bc75e00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 10:21:10 -0700 Subject: [PATCH 035/312] spidermonkey_52: 52.8.0 -> 52.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spidermonkey/versions. These checks were done: - built on NixOS - /nix/store/4rnqlff4g9vx7ci5b0a6936h9ffk4l8x-spidermonkey-52.8.1/bin/js52 passed the binary check. - /nix/store/4rnqlff4g9vx7ci5b0a6936h9ffk4l8x-spidermonkey-52.8.1/bin/js52-config passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 2 of 2 passed binary check by having the new version present in output. - found 52.8.1 with grep in /nix/store/4rnqlff4g9vx7ci5b0a6936h9ffk4l8x-spidermonkey-52.8.1 - directory tree listing: https://gist.github.com/75305a95a88a23a3137429c0c5c0007c - du listing: https://gist.github.com/fe4b93f198ce1088e1e18d002d9cb49a --- pkgs/development/interpreters/spidermonkey/52.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 4657a51e48f9..2a10caec3af8 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.8.0"; + version = "52.8.1"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms"; + sha256 = "0yyg9405y19n22x1gybyl7vp6zglbl5h749rsvgv9bm4x5zlnys8"; }; buildInputs = [ readline icu zlib nspr ]; From 60ed533188ea9e6dc1955aba36d13a3d6d85f94b Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Sat, 23 Jun 2018 18:40:29 +0100 Subject: [PATCH 036/312] factorio: 0.16.36 -> 0.16.51 --- pkgs/games/factorio/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 2cc63e9ecdef..d0ffa10baeca 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; - experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; + stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; }; + experimental = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; }; }; demo = { - stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; + stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.16.36" + , version ? "0.16.51" , fetcher ? fetchurl , nameMut ? x: x }: From 0ac09be2959c7c9c12d799be8d5a19f6132b8464 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 14:07:49 -0500 Subject: [PATCH 037/312] llvm4: unconditionally set triples, not just on musl. Split off from #42454 as requested. --- pkgs/development/compilers/llvm/4/llvm.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index a371296db326..eb1b3db4023c 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,6 +100,10 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -115,11 +119,6 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' From 6fe8c62c8fb394dc218d5f394302b385221fe7fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 12:47:32 -0700 Subject: [PATCH 038/312] lxqt.qtermwidget: 0.8.0 -> 0.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qtermwidget/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.9.0 with grep in /nix/store/3xrdwiihv6005a89hg2yz049dwj1yvjk-qtermwidget-0.9.0 - directory tree listing: https://gist.github.com/32846676d9b32d68c711e46efb4b2822 - du listing: https://gist.github.com/08616a507ab3f444a6710fbb666e20dc --- pkgs/desktops/lxqt/core/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index f882088d07b8..56c42cb28532 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4"; + sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; From 771de50389e9d6fee1cb6b2f02b5570fefee017c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 13:11:44 -0700 Subject: [PATCH 039/312] pony-stable: 0.1.3 -> 0.1.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pony-stable/versions. These checks were done: - built on NixOS - /nix/store/lb8ipik1qmjzhjnj04iv92as8k763cpd-pony-stable-0.1.4/bin/stable passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.1.4 with grep in /nix/store/lb8ipik1qmjzhjnj04iv92as8k763cpd-pony-stable-0.1.4 - directory tree listing: https://gist.github.com/3550bd75a6690902598b047ba7dba1a9 - du listing: https://gist.github.com/3f202ed132af36d390ed59ab7da008a6 --- pkgs/development/compilers/ponyc/pony-stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 6a0965360f68..f27147d9743a 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf"; + sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx"; }; buildInputs = [ ponyc ]; From 732b9d9943bf304682ac564618146284e68846db Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 22 Jun 2018 18:34:07 +0200 Subject: [PATCH 040/312] nbd: 3.14 -> 3.17 remove deprecated patch --- pkgs/tools/networking/nbd/default.nix | 6 ++---- .../nbd/dont-run-make-in-broken-systemd-subdir.patch | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index bbd003a6256c..6b6d99e745e1 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.14"; + name = "nbd-3.17"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; + sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; }; - patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch deleted file mode 100644 index ad0a7a6f66de..000000000000 --- a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in ---- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 -+++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 -@@ -403,7 +403,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = . man doc tests systemd gznbd -+SUBDIRS = . man doc tests gznbd - sbin_PROGRAMS = @NBD_CLIENT_NAME@ - noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la - libcliserv_la_SOURCES = cliserv.h cliserv.c From 0e3d6154ae876e9b47673352af802993db8a350e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 13:48:46 -0700 Subject: [PATCH 041/312] osinfo-db-tools: 1.1.0 -> 1.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db-tools/versions. These checks were done: - built on NixOS - /nix/store/m0gzbmf3n18xip9y64iwqmy7a0yfa51j-osinfo-db-tools-1.2.0/bin/osinfo-db-validate passed the binary check. - /nix/store/m0gzbmf3n18xip9y64iwqmy7a0yfa51j-osinfo-db-tools-1.2.0/bin/osinfo-db-import passed the binary check. - /nix/store/m0gzbmf3n18xip9y64iwqmy7a0yfa51j-osinfo-db-tools-1.2.0/bin/osinfo-db-export passed the binary check. - /nix/store/m0gzbmf3n18xip9y64iwqmy7a0yfa51j-osinfo-db-tools-1.2.0/bin/osinfo-db-path passed the binary check. - 4 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 1.2.0 with grep in /nix/store/m0gzbmf3n18xip9y64iwqmy7a0yfa51j-osinfo-db-tools-1.2.0 - directory tree listing: https://gist.github.com/9181decaf4161cfbaa99ab2b20bb161a - du listing: https://gist.github.com/bbf02890ab226a162c6cbc90e54f0f4f --- pkgs/tools/misc/osinfo-db-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 3464a92fa110..10aa5d1ae99b 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "osinfo-db-tools-1.1.0"; + name = "osinfo-db-tools-1.2.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1"; + sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v"; }; nativeBuildInputs = [ pkgconfig intltool ]; From c5e90a929295ed937e1b2d60e26bd002ca84e2a0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 16:53:38 -0500 Subject: [PATCH 042/312] llvm_{38,39}: unconditionally set triples, not just w/musl Follow-on to same changes made to other versions: See #42454, #42456. --- pkgs/development/compilers/llvm/3.8/llvm.nix | 4 ++++ pkgs/development/compilers/llvm/3.9/llvm.nix | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index b847a67e7e3f..835a5008ef58 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -78,6 +78,10 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 708e471bd4ac..458ad7db8efd 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -122,6 +122,10 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -133,9 +137,6 @@ in stdenv.mkDerivation rec { "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" From b9137d6bce397e6b6f88367abdc60705409fd670 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 18:48:17 -0700 Subject: [PATCH 043/312] openlibm: 0.5.5 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openlibm/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.6.0 with grep in /nix/store/crnh2jiksr0b3sq5v6fc9x7zrrsjgirg-openlibm-0.6.0 - directory tree listing: https://gist.github.com/c287196625881e2d6c72af761704718e - du listing: https://gist.github.com/ac9a45900fb2ba4ff48120c343677dec --- pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 195b90c86e1a..3e8524b40140 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "openlibm-${version}"; - version = "0.5.5"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07"; + sha256 = "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"; }; makeFlags = [ "prefix=$(out)" ]; From 7c0afcd7c4b8b41bd51f5bb83b526b90a8e2156c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 19:43:11 -0700 Subject: [PATCH 044/312] lxqt.obconf-qt: 0.12.0 -> 0.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/obconf-qt/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/8sixxrkxdsqd1x37m32jlraa3193ahl6-obconf-qt-0.13.0/bin/obconf-qt had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.13.0 with grep in /nix/store/8sixxrkxdsqd1x37m32jlraa3193ahl6-obconf-qt-0.13.0 - directory tree listing: https://gist.github.com/db1190dab0d515449974bf0da5486e41 - du listing: https://gist.github.com/8ad4a03d3203c3dd52b7172d3e5432d6 --- pkgs/desktops/lxqt/optional/obconf-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index c40b9c4e9f94..cd3b91f4cbdf 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5"; + sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn"; }; nativeBuildInputs = [ From 66ae89bf95ce61925d9f55dd2855751983d808ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 19:58:16 -0700 Subject: [PATCH 045/312] nagios: 4.3.4 -> 4.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nagios/versions. These checks were done: - built on NixOS - /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/nagios passed the binary check. - /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/nagiostats passed the binary check. - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/archivejson.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/avail.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/cmd.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/config.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/extinfo.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/histogram.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/history.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/notifications.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/objectjson.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/outages.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/showlog.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/status.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statusjson.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statusmap.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statuswml.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statuswrl.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/summary.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/tac.cgi had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/trends.cgi had a zero exit code or showed the expected version - 2 of 21 passed binary check by having a zero exit code. - 0 of 21 passed binary check by having the new version present in output. - found 4.4.0 with grep in /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0 - directory tree listing: https://gist.github.com/8dd6e454a51a3faf0756a68239207b0c - du listing: https://gist.github.com/3a2aa37f2b390790b9578447b099cc88 --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 47bc6d58da90..6191d667bbe9 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.3.4"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"; + sha256 = "1ldpyk7jxarp52m5vhmrgrgic251ypfzb91hilc0gbmcq9b0l5k6"; }; patches = [ ./nagios.patch ]; From dc24ee429a4b2340ca6cc85d19d9be1f81d8f56d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 20:37:13 -0700 Subject: [PATCH 046/312] lxqt.lxqt-l10n: 0.12.0 -> 0.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxqt-l10n/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/583bf7b46d9b7d60406ab44e9f06eb42 - du listing: https://gist.github.com/26da5523d884e68e9a772af08be299cf --- pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index 10b767aedac0..8324cdc3dff0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4"; + sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k"; }; nativeBuildInputs = [ From 81ea1d58d1928c2512fdc2cda241dca7022d6da8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 20:41:31 -0700 Subject: [PATCH 047/312] lxqt.libsysstat: 0.4.0 -> 0.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsysstat/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.4.1 with grep in /nix/store/n6dins6prgmhp4jb1x7iih366ln6bygb-libsysstat-0.4.1 - directory tree listing: https://gist.github.com/e91bc96d4c04d612f32bde806fdb822a - du listing: https://gist.github.com/55928df59585ba9de34d7ac2e1e0cc50 --- pkgs/desktops/lxqt/base/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index b5013f5ac1aa..409afe6d7729 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx"; + sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; From 6ac2ab2f3212a7f2d5be18c6ead2e0c6cadc7c52 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 20:54:14 -0700 Subject: [PATCH 048/312] lxqt.lxqt-themes: 0.12.0 -> 0.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxqt-themes/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.13.0 with grep in /nix/store/fs36lbzyd10wzif3mk70hwjqwin8bv7f-lxqt-themes-0.13.0 - directory tree listing: https://gist.github.com/ba1226aef8f1c4dfc1ae26d7a55031f3 - du listing: https://gist.github.com/99abafab17751529577df2cd7d2a12d9 --- pkgs/desktops/lxqt/core/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix index 6251667430b2..5f996c78643d 100644 --- a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-themes"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n"; + sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5"; }; nativeBuildInputs = [ From e9b71faf3d2fe767059d71596837265b2d7f4c3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 21:15:24 -0700 Subject: [PATCH 049/312] mate.mate-sensors-applet: 1.20.1 -> 1.20.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-sensors-applet/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.20.2 with grep in /nix/store/57vzc483bg7wbf8kx7xacsfyd2pa7d81-mate-sensors-applet-1.20.2 - directory tree listing: https://gist.github.com/b87e08ecd1269611cfc12caee03ec0a8 - du listing: https://gist.github.com/7ea36f0bc246d7aa8601097266a844c2 --- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index d82cd4b073a2..b108a20d5f06 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x"; + sha256 = "0khxzwjjf2gp9ma6ji0ynvvqlw6hhr8j4gff9klkrn60xbg5h16b"; }; nativeBuildInputs = [ From 3d2c33ba897352228de6691d1ec9988759db65e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 21:19:16 -0700 Subject: [PATCH 050/312] mate.mate-system-monitor: 1.20.0 -> 1.20.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-system-monitor/versions. These checks were done: - built on NixOS - /nix/store/x5i2inxsxs4jcjqhsn3mv94lsdxmr3g7-mate-system-monitor-1.20.1/bin/mate-system-monitor passed the binary check. - /nix/store/x5i2inxsxs4jcjqhsn3mv94lsdxmr3g7-mate-system-monitor-1.20.1/bin/.mate-system-monitor-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.20.1 with grep in /nix/store/x5i2inxsxs4jcjqhsn3mv94lsdxmr3g7-mate-system-monitor-1.20.1 - directory tree listing: https://gist.github.com/a4cdb9b1bfcf5b27047a4f9635faa789 - du listing: https://gist.github.com/1a05da069ac7049838de573c089699de --- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 8c67044a4220..0dc21f276732 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-system-monitor-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5"; + sha256 = "1a68il7pbch5028fm2caxyjkfrdc6ixhqnaspbwfziw6y8p9bscn"; }; nativeBuildInputs = [ From e52ac55e9ca9487319e97f98d529bfbe4562bd97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 21:34:02 -0700 Subject: [PATCH 051/312] jackett: 0.8.1070 -> 0.8.1138 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - /nix/store/qrcg5rrhydf0622l7s9m8n87x2w2az2j-jackett-0.8.1138/bin/Jackett passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.8.1138 with grep in /nix/store/qrcg5rrhydf0622l7s9m8n87x2w2az2j-jackett-0.8.1138 - directory tree listing: https://gist.github.com/59f09486090429273b9aa0822ca9440e - du listing: https://gist.github.com/d25094cef4e9313932610108d54d6128 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2190ae1afa26..f2ed31072eea 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.1070"; + version = "0.8.1138"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1xdmf1nvs1y8jhivmc0sw8cip925xrj8hg66z0awcymri6qnp6s9"; + sha256 = "0f6n6n2cxbw1gj905kilifsxid4nskk849hzafl6lqxk5nz4fs18"; }; buildInputs = [ makeWrapper ]; From b3663555d8f55a5c55be12f0c2661836046b85c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 22:02:07 -0700 Subject: [PATCH 052/312] lxqt.libfm-qt: 0.12.0 -> 0.13.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libfm-qt/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.13.1 with grep in /nix/store/j3k46ff4i767vxiajc1dy41fd5smdqid-libfm-qt-0.13.1 - directory tree listing: https://gist.github.com/f8d05638960a752c27ada529e3d8922e - du listing: https://gist.github.com/9a3529479e5f3453a388a2bdadff58aa --- pkgs/desktops/lxqt/core/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 612fbeafe199..f3a50814d638 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i"; + sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j"; }; nativeBuildInputs = [ From a7b3c2eeade955febdd0dcffd1f0773aa2413dc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 22:08:34 -0700 Subject: [PATCH 053/312] leatherman: 1.4.1 -> 1.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/leatherman/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.4.2 with grep in /nix/store/r5pgnnj5j1n4p59xa4zr2nm4pjbwcwhq-leatherman-1.4.2 - directory tree listing: https://gist.github.com/c901957b585910ac947b083d026a7598 - du listing: https://gist.github.com/77c6bc02640505c537f0bd7cd13c79a6 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 7b6834166d8c..a269069fb048 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { - sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc"; + sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From f8bd92be32f13056e91ead20010f20b48bbd9690 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 23:47:00 -0700 Subject: [PATCH 054/312] guake: 3.2.2 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guake/versions. These checks were done: - built on NixOS - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/guake passed the binary check. - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/guake-toggle passed the binary check. - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/..guake-wrapped-wrapped passed the binary check. - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/.guake-wrapped passed the binary check. - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/..guake-toggle-wrapped-wrapped passed the binary check. - /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0/bin/.guake-toggle-wrapped passed the binary check. - 6 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 3.3.0 with grep in /nix/store/69i8y52xjknpcnijqhw1gq8c7r5fj1yb-guake-3.3.0 - directory tree listing: https://gist.github.com/08e53f1dab9dd720370787fafe8d0c02 - du listing: https://gist.github.com/aeb429d5b911c7b6b6ffdf25824eb7bd --- pkgs/applications/misc/guake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index dc9b0c29aa10..57dc68263ac4 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.2.2"; + version = "3.3.0"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1wx8vghn0h52xryyn6cf9z1lbwsk766lhff162szbaxlxyl6xsc0"; + sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; From 6cf87da34eb9f5adb1698f15813abb4b1d05841d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 23:52:19 -0700 Subject: [PATCH 055/312] guitarix: 0.37.0 -> 0.37.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guitarix/versions. These checks were done: - built on NixOS - /nix/store/75d02i1k7n87j0qb3sd10kxf4v70sdsc-guitarix-0.37.1/bin/guitarix passed the binary check. - /nix/store/75d02i1k7n87j0qb3sd10kxf4v70sdsc-guitarix-0.37.1/bin/.guitarix-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.37.1 with grep in /nix/store/75d02i1k7n87j0qb3sd10kxf4v70sdsc-guitarix-0.37.1 - directory tree listing: https://gist.github.com/85b2e7786143f42e961c06cbde8de90b - du listing: https://gist.github.com/6ef7508c8fd678e37bed9c76a4e00f34 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 62bc2fa6f36f..5c34293e7f9f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6"; + sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; From e395ba077700f8575e4ad32ae4b2a22340b77fcf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 00:04:14 -0700 Subject: [PATCH 056/312] fwts: 18.05.00 -> 18.06.02 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwts/versions. These checks were done: - built on NixOS - /nix/store/bs0xv1vsc6zf0cylv6j8iidiwcg9zqx9-fwts-18.06.02/bin/fwts passed the binary check. - Warning: no invocation of /nix/store/bs0xv1vsc6zf0cylv6j8iidiwcg9zqx9-fwts-18.06.02/bin/kernelscan had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 18.06.02 with grep in /nix/store/bs0xv1vsc6zf0cylv6j8iidiwcg9zqx9-fwts-18.06.02 - directory tree listing: https://gist.github.com/c871651eb151d0cf25aa751e4e925e27 - du listing: https://gist.github.com/a7b8160c0b4fbc5ed2fa237004865949 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index a3d8d0a0eece..40d6967c66f4 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.05.00"; + version = "18.06.02"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "0ixc82zdv4cfj8g2mwd851fc47cpjj81mwjhn00n5wddb9cxmgkj"; + sha256 = "1j7yn3qyy9baylhjvr9j8hiyl1nc7la1j4fffvxk8qvxakwxbyl2"; stripRoot = false; }; From 51c00872d3a7937817cdcd8ddd733ccc576008ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 00:26:34 -0700 Subject: [PATCH 057/312] folly: 2018.06.11.00 -> 2018.06.18.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2018.06.18.00 with grep in /nix/store/cbijzsfm1ik0hmblhsg9q8krwq0gs69r-folly-2018.06.18.00 - directory tree listing: https://gist.github.com/d36711520cd03c3b19d6a9f3bc3dc523 - du listing: https://gist.github.com/d83b87211ca6b6a6a538eccba6783c66 --- 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 5dd96c225846..97ad0c08ad96 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 = "2018.06.11.00"; + version = "2018.06.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "005p2i36vxy2nppxqhdd4a5x58yx7zljb2diyqb820jygz2hfz8a"; + sha256 = "0698wazz99wzfbz29jgkl4rlakypg3v2cnsjg9a0yq83a4y038p7"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From e48aac54fd159a91ecf732f090921b8346360c28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 01:25:55 -0700 Subject: [PATCH 058/312] flyway: 5.1.1 -> 5.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flyway/versions. These checks were done: - built on NixOS - /nix/store/iw4rl4pi38wjywnvw123qbr3y2nvq2b3-flyway-5.1.3/bin/flyway passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 5.1.3 with grep in /nix/store/iw4rl4pi38wjywnvw123qbr3y2nvq2b3-flyway-5.1.3 - directory tree listing: https://gist.github.com/106acf9a49f47aca074952bf0cc79dc7 - du listing: https://gist.github.com/51bdf3dc1d3334b3be4b67b14ea31955 --- pkgs/development/tools/flyway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 924dde91acc5..866366353345 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.1.1"; + version = "5.1.3"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-${version}.tar.gz"; - sha256 = "0kdi7m5rwlik0d2rn9s3siqmc83xfkhhsdxw3g7r1mvk2ivscb7f"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.3/flyway-commandline-${version}.tar.gz"; + sha256 = "08nrjrpcb56f2mhghgjbvl7bfzvlgc81ykxzghq3kpslx5d560lm"; }; buildInputs = [ makeWrapper ]; dontBuild = true; From 8cbc9fd8dafea35cb6dfec24dcf90a6360a0c619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 Jun 2018 01:30:52 -0700 Subject: [PATCH 059/312] docker_compose: 1.20.1 -> 1.21.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/docker-compose/versions. These checks were done: - built on NixOS - /nix/store/z6xj749vplzm2x4hv93l34b41cb049kb-docker-compose-1.21.2/bin/.docker-compose-wrapped passed the binary check. - /nix/store/z6xj749vplzm2x4hv93l34b41cb049kb-docker-compose-1.21.2/bin/docker-compose passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.21.2 with grep in /nix/store/z6xj749vplzm2x4hv93l34b41cb049kb-docker-compose-1.21.2 - directory tree listing: https://gist.github.com/6a7d68b839f5f57301d1c477e48ce88c - du listing: https://gist.github.com/d1fd19f768c67e0cc36e885228ca138a --- pkgs/development/python-modules/docker_compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index a739c341b62d..80a3a6d949c6 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.20.1"; + version = "1.21.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66"; + sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38"; }; # lots of networking and other fails From 9645c867a36c6803b17bcfaa965f20273498f13c Mon Sep 17 00:00:00 2001 From: dukzcry Date: Sun, 24 Jun 2018 11:49:08 +0300 Subject: [PATCH 060/312] nvidia-x11: pass kernel.modDirVersion --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 - pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index cd7733f43a48..15c3e10e1199 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,7 +17,6 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 13e5d1b76ea6..0fe0f3d92c92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -55,6 +55,7 @@ let outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; + kernelVersion = if libsOnly then null else kernel.modDirVersion; hardeningDisable = [ "pic" "format" ]; From 401370287a9b74fc18539fe9c0bdc7ac9df9cf22 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 24 Jun 2018 11:32:10 +0200 Subject: [PATCH 061/312] strongswan-swanctl: adapt options to strongswan-5.6.3 This time there was only one change between 5.6.2..5.6.3: https://github.com/strongswan/strongswan/commit/2c7a4b07045786ee493021020e2ad5bd6bb4d045 --- .../networking/strongswan-swanctl/swanctl-params.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index ad211f41eef0..e65616332640 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -938,9 +938,12 @@ in { protection. ''; - hw_offload = mkYesNoParam no '' + hw_offload = mkEnumParam ["yes" "no" "auto"] "no" '' Enable hardware offload for this CHILD_SA, if supported by the IPsec - implementation. + implementation. The value yes enforces offloading + and the installation will fail if it's not supported by either kernel or + device. The value auto enables offloading, if it's + supported, but the installation does not fail otherwise. ''; start_action = mkEnumParam ["none" "trap" "start"] "none" '' From 4dae72c8797eb9f0bad0579bb4690e51d6545e9e Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Sun, 24 Jun 2018 17:36:11 +0200 Subject: [PATCH 062/312] fix for master --- pkgs/misc/drivers/epkowa/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index e01967019943..ca7ac4b41528 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -6,7 +6,7 @@ libxslt, libusb, sane-backends, rpm, cpio, -eject, +getopt, patchelf, gcc }: @@ -55,6 +55,7 @@ let plugins = { ''; hw = "Perfection V500 Photo"; }; + meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; }; f720 = stdenv.mkDerivation rec { name = "iscan-gt-f720-bundle"; @@ -155,7 +156,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' # iscan-registry is a shell script requiring getopt - wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin + wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; '' + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' From ea7c74c7729c037f2eaab4da99f3d55b8bacc92b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jun 2018 09:20:13 +0000 Subject: [PATCH 063/312] ocamlPackages.re: 1.7.1 -> 1.7.3 --- pkgs/development/ocaml-modules/re/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 861ac8b3bc81..c6f1b6d17581 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "re is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml-re-${version}"; - version = "1.7.1"; + name = "ocaml${ocaml.version}-re-${version}"; + version = "1.7.3"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw"; + sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + buildInputs = [ ocaml findlib jbuilder ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out" - + stdenv.lib.optionalString doCheck " --enable-tests"; - buildPhase = "ocaml setup.ml -build"; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + doCheck = true; + checkPhase = "jbuilder runtest"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { homepage = https://github.com/ocaml/ocaml-re; From 3e60af02d3bc0f83f91987b6d6763d1046b306a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jun 2018 12:59:48 +0000 Subject: [PATCH 064/312] ocamlPackages.bap: fix build with re-1.7.3 --- pkgs/development/ocaml-modules/bap/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 8c42783c9780..8882bbf66474 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,10 +1,12 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +, ocaml, findlib, ocamlbuild, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, utop, - which, makeWrapper, writeText, ocaml}: + which, makeWrapper, writeText +}: -buildOcaml rec { - name = "bap"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-bap-${version}"; version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -18,6 +20,11 @@ buildOcaml rec { sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; + patches = [(fetchpatch { + url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch"; + sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk"; + })]; + createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' @@ -27,7 +34,7 @@ buildOcaml rec { nativeBuildInputs = [ which makeWrapper ]; - buildInputs = [ ocaml_oasis + buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis llvm_38 utop ]; From ec73f89a55dec7cfd75ba51d453a2fb62712e5f7 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sun, 24 Jun 2018 10:12:12 -0400 Subject: [PATCH 065/312] structure-synth: init at v1.5 --- .../graphics/structure-synth/default.nix | 47 +++++++++++++++++ .../graphics/structure-synth/gcc47.patch | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 99 insertions(+) create mode 100644 pkgs/tools/graphics/structure-synth/default.nix create mode 100644 pkgs/tools/graphics/structure-synth/gcc47.patch diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix new file mode 100644 index 000000000000..92a7d69aa915 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "structure-synth-${version}"; + version = "v1.5"; + + src = fetchurl { + url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; + }; + + buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + nativeBuildInputs = [ qmake4Hook ]; + + # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: + patches = [ ./gcc47.patch ]; + + enableParallelBuilding = true; + + preConfigure = '' + ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" + ''; + + installPhase = '' + mkdir -p $out/bin; + mkdir -p $out/share/Examples $out/share/Misc; + cp "Structure Synth Source Code" $out/bin/structure-synth; + cp -r Examples/* $out/share/Examples; + cp -r Misc/* $out/share/Misc; + ''; + + # Structure Synth expects to see 'Examples' and 'Misc' directory in + # either $HOME or $PWD - so help it along by moving $PWD to 'share', + # where we just copied those two directories: + preFixup = '' + wrapProgram "$out/bin/structure-synth" --run "cd $out/share" + ''; + + meta = with stdenv.lib; { + description = "Application for generating 3D structures by specifying a design grammar"; + homepage = http://structuresynth.sourceforge.net; + maintainers = with maintainers; [ hodapp ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch new file mode 100644 index 000000000000..8726e89c8308 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/gcc47.patch @@ -0,0 +1,50 @@ +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400 +*************** +*** 1,5 **** + #include +! + + #include "RayTracer.h" + +--- 1,5 ---- + #include +! #include + + #include "RayTracer.h" + +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400 +*************** +*** 122,128 **** + currentT = p; + + // We do not intersect grid. +! if (!found) return false; + } + + stepX = (dir.x() > 0) ? 1 : -1; +--- 122,128 ---- + currentT = p; + + // We do not intersect grid. +! if (!found) return NULL; + } + + stepX = (dir.x() > 0) ? 1 : -1; +Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400 +*************** +*** 2,7 **** +--- 2,8 ---- + + #include "SyntopiaCore/Math/Vector3.h" + #include "Object3D.h" ++ #include + + namespace SyntopiaCore { + namespace GLEngine { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c5ecb49bc3f..a7ecc0715166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5129,6 +5129,8 @@ with pkgs; sstp = callPackage ../tools/networking/sstp {}; + structure-synth = callPackage ../tools/graphics/structure-synth { }; + su-exec = callPackage ../tools/security/su-exec {}; subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; From 48a619af549e35b22ad2d988f85c53cfe86e5501 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Jun 2018 17:10:56 -0500 Subject: [PATCH 066/312] 1password: fix sha256 hash --- pkgs/applications/misc/1password/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 60391eee6927..c81481270c2f 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -7,19 +7,19 @@ stdenv.mkDerivation rec { if stdenv.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip"; - sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f"; + sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip"; - sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1"; + sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip"; - sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb"; + sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a"; stripRoot = false; } else throw "Architecture not supported"; From 938a90f55de1086c496fa7f9e43e2f9e54ad1322 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Jun 2018 17:11:40 -0500 Subject: [PATCH 067/312] 1password: Remove unneeded dependency --- pkgs/applications/misc/1password/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index c81481270c2f..d5818614b9e0 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "1password-${version}"; @@ -6,25 +6,24 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a"; stripRoot = false; } else throw "Architecture not supported"; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D op $out/bin/op ''; From 574b5365c72f0c8faf114798fc79726bf32bc434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 24 Jun 2018 19:18:51 +0200 Subject: [PATCH 068/312] consul-alerts: 0.3.3 -> 0.5.0 --- .../monitoring/consul-alerts/default.nix | 6 ++-- .../servers/monitoring/consul-alerts/deps.nix | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/monitoring/consul-alerts/deps.nix diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index ad840dfd607f..7a1422e1e2dd 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -2,15 +2,17 @@ buildGoPackage rec { name = "consul-alerts-${version}"; - version = "0.3.3"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/AcalephStorage/consul-alerts"; + goDeps = ./deps.nix; + src = fetchFromGitHub { inherit rev; owner = "AcalephStorage"; repo = "consul-alerts"; - sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq"; + sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; }; } diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/servers/monitoring/consul-alerts/deps.nix new file mode 100644 index 000000000000..6494dc61a87c --- /dev/null +++ b/pkgs/servers/monitoring/consul-alerts/deps.nix @@ -0,0 +1,34 @@ +let + mkAwsPackage = name: { + goPackagePath = "github.com/aws/aws-sdk-go/${name}"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.14.13"; + sha256 = "0014b6kl3rbjhjbk7jz116wdgdls54b1bwz454pkn1snlvkj3qil"; + }; + }; +in +[ + (mkAwsPackage "") + (mkAwsPackage "aws/session") + (mkAwsPackage "aws/sns") + (mkAwsPackage "service/sns") + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + }{ + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; # has no releases as of writing + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } +] From e6ec309720089a108ef19d2eeedbc15671ac1e4a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Jun 2018 21:21:55 -0400 Subject: [PATCH 069/312] lollypop: 0.9.514 -> 0.9.516 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 50356eaadd50..3c04cbc6c80a 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,14 +3,14 @@ , python36Packages, gnome3, glib, gst_all_1 }: stdenv.mkDerivation rec { - version = "0.9.514"; + version = "0.9.516"; name = "lollypop-${version}"; src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0ny8c5apldhhrcjl3wz01pbyjvf60b7xy39mpvbshvdpnqlnqsca"; + sha256 = "0ln77cmcl5wi4xis9kmzg0knbykzwsd1n78rr7ff5y35m9p2zgrf"; }; nativeBuildInputs = with python36Packages; [ From 0ee0582a8f69b1d443500daeb1fd4907afc6c341 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 24 Jun 2018 23:06:36 +0200 Subject: [PATCH 070/312] casync: init at 2-152-ge4a3c5e --- .../networking/sync/casync/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/sync/casync/default.nix diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix new file mode 100644 index 000000000000..d8b977af7a1b --- /dev/null +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, sphinx, acl, curl, fuse, libselinux, udev, xz, zstd }: + +stdenv.mkDerivation rec { + name = "casync-${version}"; + version = "2-152-ge4a3c5e"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "casync"; + rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; + sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + }; + + buildInputs = [ acl curl fuse libselinux udev xz zstd ]; + nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + + meta = with stdenv.lib; { + description = "Content-Addressable Data Synchronizer"; + homepage = https://github.com/systemd/casync; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d63580c89c1..184a925c48ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -991,6 +991,10 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; + casync = callPackage ../applications/networking/sync/casync { + sphinx = python3Packages.sphinx; + }; + cataract = callPackage ../applications/misc/cataract { }; cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; From 583ec8eac3f17585f86381624ffefedbf7a8a2a0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Jun 2018 01:49:52 +0200 Subject: [PATCH 071/312] casync: enable tests --- .../networking/sync/casync/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index d8b977af7a1b..25d9d65c5a87 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, sphinx, acl, curl, fuse, libselinux, udev, xz, zstd }: +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, sphinx +, acl, curl, fuse, libselinux, udev, xz, zstd +, glibcLocales, rsync +}: stdenv.mkDerivation rec { name = "casync-${version}"; @@ -13,9 +17,22 @@ stdenv.mkDerivation rec { buildInputs = [ acl curl fuse libselinux udev xz zstd ]; nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + checkInputs = [ glibcLocales rsync ]; + + postPatch = '' + for f in test/test-*.sh.in; do + patchShebangs $f + done + patchShebangs test/http-server.py + ''; PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + doCheck = true; + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + meta = with stdenv.lib; { description = "Content-Addressable Data Synchronizer"; homepage = https://github.com/systemd/casync; From de9abc0d9e91910b8ad953766835160044bbda99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Jun 2018 02:17:01 +0200 Subject: [PATCH 072/312] casync: add feature flags for fuse, selinux and udev --- pkgs/applications/networking/sync/casync/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 25d9d65c5a87..38c9e07367f8 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, sphinx , acl, curl, fuse, libselinux, udev, xz, zstd +, fuseSupport ? true +, selinuxSupport ? true +, udevSupport ? true , glibcLocales, rsync }: @@ -15,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; }; - buildInputs = [ acl curl fuse libselinux udev xz zstd ]; + buildInputs = [ acl curl xz zstd ] + ++ stdenv.lib.optionals (fuseSupport) [ fuse ] + ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] + ++ stdenv.lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; checkInputs = [ glibcLocales rsync ]; @@ -27,6 +33,9 @@ stdenv.mkDerivation rec { ''; PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' From 0dfc32989118c5441df52676de90a865e6e0abf9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 25 Jun 2018 02:17:27 +0200 Subject: [PATCH 073/312] casync: restrict to linux libacl is required, which is linux-only. --- pkgs/applications/networking/sync/casync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 38c9e07367f8..82dd3a506dee 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Content-Addressable Data Synchronizer"; homepage = https://github.com/systemd/casync; license = licenses.lgpl21; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; }; } From c1740904aeb574ac5f01c63c5c39480724cff7ed Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 24 Jun 2018 18:49:30 -0700 Subject: [PATCH 074/312] firefox: add u2f support --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6067911b7165..c2b83a0187f8 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -66,10 +66,11 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = lib.optional ffmpegSupport ffmpeg + libs = [ libudev ] + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gtk_modules = [ libcanberra-gtk2 ]; From e1784a0435a3feb262293c7bcc7a3e594472cc38 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Jun 2018 22:32:43 -0400 Subject: [PATCH 075/312] lollypop: move appstream-glib and gobjectIntrospection to nativeBuildInputs --- pkgs/applications/audio/lollypop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3c04cbc6c80a..3b967186112b 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = with python36Packages; [ + appstream-glib desktop-file-utils + gobjectIntrospection meson ninja pkgconfig @@ -22,9 +24,7 @@ stdenv.mkDerivation rec { wrapPython ]; - buildInputs = [ - appstream-glib glib gobjectIntrospection - ] ++ (with gnome3; [ + buildInputs = [ glib ] ++ (with gnome3; [ easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly From 367a7ae138b55193d4ddea60940d01f2b10a5cb0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 25 Jun 2018 10:53:18 +0200 Subject: [PATCH 076/312] pythonPackages.rlp: revert to working 0.6.0 It is required by electrum. --- pkgs/development/python-modules/rlp/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index fd4816c3bb57..87a59cf73975 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "rlp"; - version = "1.0.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512"; + sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; }; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ ]; meta = { @@ -17,6 +17,5 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/pyrlp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gebner ]; - broken = true; # Requires a chain of unpackaged dependencies. }; } From 134eca9993fa3a8c8c7dd2bd5d8f413da1f24cd5 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 25 Jun 2018 17:15:40 +0800 Subject: [PATCH 077/312] ecs-agent: 1.14.0 -> 1.18.0 (#42359) --- pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 5b3610243be0..711838b29447 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "amazon-ecs-agent"; - version = "1.14.0"; + version = "1.18.0"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3"; + sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr"; }; meta = with stdenv.lib; { From f8530c887bb9d6455d6f0cd0b1ca2b64fd5c2e4d Mon Sep 17 00:00:00 2001 From: nocent Date: Mon, 25 Jun 2018 09:45:51 +0000 Subject: [PATCH 078/312] rpcs3: 0.0.4-8032 -> 0.0.5-6980 (#41414) * rpcs3: 0.0.4-8032 -> 0.0.5-6884 * rpcs3: update hash * rpcs3: 0.0.5-6884 -> 0.0.5-6925 * rpcs3: 0.0.5-6925 -> 0.0.5-6938 * rpcs3: 0.0.5-6938 -> 0.0.5-6980 Manually write version header instead of generating it with git, which required leaveDotGit to be enabled. This caused some hash mismatches (see #8567) has thus been disabled. --- pkgs/misc/emulators/rpcs3/default.nix | 50 +++++++++++++++++---------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 140149bde495..732a5971ed3c 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,19 +1,31 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig -, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "2018-02-23"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; - sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x"; - }; +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +let + majorVersion = "0.0.5"; + gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) +in +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "${majorVersion}-${gitVersion}"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; + sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; + }; + + preConfigure = '' + cat > ./rpcs3/git-version.h < Date: Mon, 25 Jun 2018 11:45:29 +0200 Subject: [PATCH 079/312] python.pkgs.psutil_1: remove unused package --- pkgs/top-level/python-packages.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bb82de095ca..5b8eb59422f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10102,15 +10102,6 @@ in { psutil = callPackage ../development/python-modules/psutil { }; - psutil_1 = self.psutil.overrideAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.2.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ibclqy6a4qmkjhlk3g8jhpvnk0v9aywknc61xm3hfi5r124m3jh"; - }; - }); - psycopg2 = buildPythonPackage rec { name = "psycopg2-2.7.1"; disabled = isPyPy; From 910cb27384b8c26a77f668dde237916ee535077a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 25 Jun 2018 12:11:09 +0200 Subject: [PATCH 080/312] php71: 7.1.18 -> 7.1.19 Changelog: https://secure.php.net/ChangeLog-7.php#7.1.19 --- 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 cede1b67475b..3032b5e4c2a1 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.18"; - sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq"; + version = "7.1.19"; + sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k"; }; php72 = generic { From 06eeb0d158829287bb26e01b6ffcf44955c876e1 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Mon, 25 Jun 2018 12:46:19 +0200 Subject: [PATCH 081/312] bazel: Don't hardcode build tools (#42552) Bazel is a build tool, much like Make and many others. Like Make, it should be agnostic to the compiler toolchains the user brings into scope. Bazel has special rules that encode domain specific knowledge for how to compile a C++ program, or indeed a Java program and a few others. But that's not to say that at runtime Bazel should assume a specific C++ compiler or Java compiler anymore than Make does. The main impact of this change is that packages that build with Bazel will have to list the compilers they want in their `buildInputs` or similar, rather than relying on the `bazel` package pulling them in transitively. --- pkgs/development/tools/build-managers/bazel/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1dac9513f948..8cb137aeda35 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -114,11 +114,10 @@ stdenv.mkDerivation rec { examples/java-native/src/test/java/com/example/myproject:hello ''; - # Bazel expects gcc and java to be in the path. installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/ cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ From c5e91939942a26164ee9ce07719b5d9a7cbbe63b Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Mon, 25 Jun 2018 12:06:33 +0100 Subject: [PATCH 082/312] pythonPackages.sklearn-deap: dropping a comment --- pkgs/development/python-modules/sklearn-deap/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 2c40ce4c2fc3..190692c43627 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; - #doCheck = false; checkPhase = '' ${python.interpreter} test.py ''; From 2cd0c2e2df0075b9ea88b8b98db39cd71f214456 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 25 Jun 2018 13:11:56 +0200 Subject: [PATCH 083/312] libvirt: enable (optional) support for iscsi storage (#42545) --- pkgs/development/libraries/libvirt/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index cb81aa262e92..49c1b054b77a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -6,6 +6,7 @@ , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null +, enableIscsi ? false, openiscsi }: with stdenv.lib; @@ -42,6 +43,8 @@ in stdenv.mkDerivation rec { libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen + ] ++ optionals enableIscsi [ + openiscsi ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations @@ -79,6 +82,8 @@ in stdenv.mkDerivation rec { "--with-storage-disk" ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" + ] ++ optionals enableIscsi [ + "--with-storage-iscsi" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; From 4a5ab6e9239fb62dbb6b943c7035cf7c503ca221 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 21 Jun 2018 23:21:05 +0200 Subject: [PATCH 084/312] =?UTF-8?q?libblockdev:=202.17=20=E2=86=92=202.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libblockdev/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 077efe299ec3..e84df0c1aedf 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml , cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let - version = "2.17"; + version = "2.18"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "14f52cj2qcnm8i2zb57qfpdk3kij2gb3xgqkbvidmf6sjicq84z2"; + sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key + glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { From 39f357a83649d742dbde23558cda0fdb09d3c306 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 25 Jun 2018 08:58:04 -0400 Subject: [PATCH 085/312] slurm: 17.11.5 -> 17.11.7, pyslurm: 20180427 -> 20180604 (#42536) * slurm: 17.11.5 -> 17.11.7, pyslurm: 20180427 -> 20180604 This commit also swaps to use the official repository's github release tags instead of their download site, which only keeps the most recent version with no historical archives. * Document why we don't run tests * Remove dead testing code --- .../python-modules/pyslurm/default.nix | 9 ++++++--- pkgs/servers/computing/slurm/default.nix | 15 ++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 1bc08d634189..9057c3970e15 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,21 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180427"; + version = "20180604"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; - sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; + rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc"; + sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj"; }; buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + # Test cases need /etc/slurm/slurm.conf and require a working slurm installation + doCheck = false; + meta = with lib; { homepage = https://github.com/PySlurm/pyslurm; description = "Python bindings to Slurm"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 7a03bf75802b..64e4005f53f3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, curl +{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg @@ -8,11 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.5"; + version = "17.11.7"; - src = fetchurl { - url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; + # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php + # because the latter does not keep older releases. + src = fetchFromGitHub { + owner = "SchedMD"; + repo = "slurm"; + # The release tags use - instead of ., and have an extra -1 suffix. + rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; + sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; }; outputs = [ "out" "dev" ]; From 6e146c370013a177eb4e446c20cfe6895cb4d4d5 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 25 Jun 2018 09:05:47 -0400 Subject: [PATCH 086/312] pythonPackages.plaid-python: init at 2.3.0 (#42530) * pythonPackages.plaid-python: init at 2.3.0 * Run unit tests with py.test --- .../python-modules/plaid-python/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/plaid-python/default.nix diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix new file mode 100644 index 000000000000..3676c676cc60 --- /dev/null +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, requests, pytest }: + +buildPythonPackage rec { + version = "2.3.0"; + pname = "plaid-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97"; + }; + + checkInputs = [ pytest ]; + # Integration tests require API keys and internet access + checkPhase = "py.test -rxs ./tests/unit"; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Python client library for the Plaid API and Link"; + homepage = https://github.com/plaid/plaid-python; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b8eb59422f7..feb64b1cbbc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3868,6 +3868,8 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + plaid-python = callPackage ../development/python-modules/plaid-python { }; + plaster = callPackage ../development/python-modules/plaster {}; plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; From dd366701cea0d2d32d27fcb34746e73e80a537fb Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 25 Jun 2018 13:33:09 +0000 Subject: [PATCH 087/312] perl528: init at 5.28.0 --- pkgs/development/interpreters/perl/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4d6f426fae43..08612ad28494 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -185,8 +185,6 @@ let setupHook = ./setup-hook-cross.sh; }); in rec { - perl = perl524; - perl522 = common { version = "5.22.4"; sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms"; @@ -201,4 +199,9 @@ in rec { version = "5.26.1"; sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; }; + + perl528 = common { + version = "5.28.0"; + sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc2589c7538..225ae79d79cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7345,7 +7345,8 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; + perl = perl524; + inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; From ec81355c8d9f8ee5a31c1e458b8a141a769a71d1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 25 Jun 2018 13:36:06 +0000 Subject: [PATCH 088/312] ocamlPackages.psmt2-frontend: init at 0.1 --- .../ocaml-modules/psmt2-frontend/default.nix | 35 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/ocaml-modules/psmt2-frontend/default.nix diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix new file mode 100644 index 000000000000..c09cf5a77c1e --- /dev/null +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.1"; + name = "ocaml${ocaml.version}-psmt2-frontend-${version}"; + + src = fetchFromGitHub { + owner = "Coquera"; + repo = "psmt2-frontend"; + rev = version; + sha256 = "0k7jlsbkdyg7hafmvynp0ik8xk7mfr00wz27vxn4ncnmp20yz4vn"; + }; + + prefixKey = "-prefix "; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ocaml findlib menhir ]; + + createFindlibDestdir = true; + + installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + + meta = { + description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3bb84e7e3a0c..6ca593f349fb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -534,6 +534,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; + psq = callPackage ../development/ocaml-modules/psq { }; ptime = callPackage ../development/ocaml-modules/ptime { }; From 01847b7c5f961d869e6823e54bbfe19eab077034 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 06:52:53 -0700 Subject: [PATCH 089/312] neofetch: 4.0.2 -> 5.0.0 (#42477) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neofetch/versions. These checks were done: - built on NixOS - /nix/store/s43pf19xk5iimnmddlwya810k9ah543v-neofetch-5.0.0/bin/neofetch passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 5.0.0 with grep in /nix/store/s43pf19xk5iimnmddlwya810k9ah543v-neofetch-5.0.0 - directory tree listing: https://gist.github.com/791916ab0ef95175e54b789ccd7be2e5 - du listing: https://gist.github.com/87e9057b70214b92a7a70e87f2d1ce9e --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index af6c17433f11..7dbfc90fa125 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2"; + sha256 = "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr"; }; dontBuild = true; From 44de467c7c7e649bd7f9d3701eb9f3663136c64c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 09:15:02 -0500 Subject: [PATCH 090/312] fac: 1.1.0 -> 2.0.0 * update deps (dep2nix) * seems to need $HOME/.fac.yml or emits warning (looks like even `touch ~/.fac.yml` appeases this) --- pkgs/development/tools/fac/default.nix | 4 ++-- pkgs/development/tools/fac/deps.nix | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 0fae9fad5d14..d6cc527e6418 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fac-${version}"; - version = "1.1.0"; + version = "2.0.0"; goPackagePath = "github.com/mkchoi212/fac"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "mkchoi212"; repo = "fac"; rev = "v${version}"; - sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx"; + sha256 = "054bbiw0slz9szy3ap2sh5dy97w3g7ms27rd3ww3i1zdhvnggwpc"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix index 65ec5ded5ad5..65335497e5ff 100644 --- a/pkgs/development/tools/fac/deps.nix +++ b/pkgs/development/tools/fac/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "1b755a90bd109f170385cb3964f0abdfd3451145"; - sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8"; + rev = "0c0b382eca61a71c1eb4cb4dea2bc78aa4939d96"; + sha256 = "0chpzs542s366vv01bfhrajdrbhmrvc3gi8jhpw3xgz6wfkivcp4"; }; } { @@ -45,22 +45,22 @@ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } - { - goPackagePath = "github.com/mkchoi212/fac"; - fetch = { - type = "git"; - url = "https://github.com/mkchoi212/fac"; - rev = "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502"; - sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz"; - }; - } { goPackagePath = "github.com/nsf/termbox-go"; fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "21a4d435a86280a2927985fd6296de56cbce453e"; - sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] \ No newline at end of file From d94d3b39b997a7f83ab5757f919be8abe1e891ff Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 09:25:25 -0500 Subject: [PATCH 091/312] udisks2: revive musl patching I believe we discussed this and believed this wasn't necessary, but without it the build breaks w/musl so re-add it. --- pkgs/os-specific/linux/udisks/2-default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 6bb12c2c792a..0c0aa84a6bd3 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -42,6 +42,12 @@ in stdenv.mkDerivation rec { gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace udisks/udisksclient.c \ + --replace 'defined( __GNUC_PREREQ)' 1 \ + --replace '__GNUC_PREREQ(4,6)' 1 + ''; + buildInputs = [ expat libgudev libblockdev acl systemd glib libatasmart polkit ]; From 7fa6b340931acaccfa8211f0dd2ef4938e68ea17 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 09:45:45 -0500 Subject: [PATCH 092/312] glib: patch to fix w/musl, quark static ctor order assumptions From [1] with prefix added, using local copy to avoid dep on fetchpatch. [1] https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/glib/patches/quark_init_on_demand.patch --- pkgs/development/libraries/glib/default.nix | 1 + .../libraries/glib/quark_init_on_demand.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/glib/quark_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac921227740c..a793bf5f7521 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch + ++ optional stdenv.hostPlatform.isMusl ./quark_init_on_demand.patch ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/development/libraries/glib/quark_init_on_demand.patch new file mode 100644 index 000000000000..168086484314 --- /dev/null +++ b/pkgs/development/libraries/glib/quark_init_on_demand.patch @@ -0,0 +1,33 @@ +--- glib-source/glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 +@@ -57,6 +57,9 @@ + void + g_quark_init (void) + { ++ if (quark_ht) ++ return; ++ + g_assert (quark_seq_id == 0); + quark_ht = g_hash_table_new (g_str_hash, g_str_equal); + quarks = g_new (gchar*, QUARK_BLOCK_SIZE); +@@ -138,9 +141,12 @@ + return 0; + + G_LOCK (quark_global); ++#if !defined(__GLIBC__) ++ g_quark_init (); ++#endif + quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); + G_UNLOCK (quark_global); + + return quark; + } + +@@ -280,6 +286,7 @@ + GQuark quark; + gchar **quarks_new; + ++ g_quark_init (); + if (quark_seq_id % QUARK_BLOCK_SIZE == 0) + { + quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE); From 44c22ef8a8376e90b17be2cfa5c44fa69f5e6b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 25 Jun 2018 16:51:09 +0200 Subject: [PATCH 093/312] consul-alerts: Add `meta` and myself as maintainer --- pkgs/servers/monitoring/consul-alerts/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 7a1422e1e2dd..646a7856788b 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -15,4 +15,13 @@ buildGoPackage rec { repo = "consul-alerts"; sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; }; + + meta = with stdenv.lib; { + description = "An extendable open source continuous integration server"; + homepage = https://github.com/AcalephStorage/consul-alerts; + # As per README + platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; + license = licenses.gpl2; + maintainers = with maintainers; [ nh2 ]; + }; } From 632624691d2d0310d894329c44be4534059ac45e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 09:55:36 -0500 Subject: [PATCH 094/312] llvm-3.8: don't set triples a second time on musl I should have "moved" the flags instead of "copying" them earlier :). --- pkgs/development/compilers/llvm/3.8/llvm.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 835a5008ef58..a6fb61198176 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -90,9 +90,6 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" From 43a737b81cd3f41f1df0f4f0bef25e048ac9155a Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Sat, 23 Jun 2018 14:39:13 +0200 Subject: [PATCH 095/312] Disable fortify and stackprotector hardening for spl/zfs. Linux 4.16 introduces a stackprotector detection script that returns different results for the kernel compilation run and the spl/zfs compilation run, as the setting for hardening are different. This results in a broken ABI between spl/zfs and the compiled kernel, breaking ZFS. Also disabling the fortify and stackprotector hardening, as we do for the kernel, fixes that. --- pkgs/os-specific/linux/spl/default.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 778f00d2a95d..af3df245fe67 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -25,7 +25,7 @@ let nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c44d64b8fa81..6eac54ddf651 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -61,7 +61,7 @@ let # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" @@ -157,7 +157,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to the latest release. version = "0.7.9"; @@ -176,7 +176,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-05-22"; @@ -199,7 +199,7 @@ in { # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; From 851ab7f323c8d369a7cd7d32bdf3d997ebf88518 Mon Sep 17 00:00:00 2001 From: Markus Ankenbrand Date: Mon, 25 Jun 2018 16:56:21 +0200 Subject: [PATCH 096/312] hmmer: init at 3.1b2 --- maintainers/maintainer-list.nix | 5 ++++ .../science/biology/hmmer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/applications/science/biology/hmmer/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d99ce88d61ef..4980e44b5b05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1707,6 +1707,11 @@ github = "igsha"; name = "Igor Sharonov"; }; + iimog = { + email = "iimog@iimog.org"; + github = "iimog"; + name = "Markus J. Ankenbrand"; + }; ikervagyok = { email = "ikervagyok@gmail.com"; github = "ikervagyok"; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix new file mode 100644 index 000000000000..8552aa34c433 --- /dev/null +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.1b2"; + name = "hmmer-${version}"; + + src = fetchurl { + url = "http://eddylab.org/software/hmmer3/${version}/${name}.tar.gz"; + sha256 = "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx"; + }; + + meta = with stdenv.lib; { + description = "Biosequence analysis using profile hidden Markov models"; + longDescription = '' +HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs). + +HMMER is often used together with a profile database, such as Pfam or many of the databases that participate in Interpro. But HMMER can also work with query sequences, not just profiles, just like BLAST. For example, you can search a protein query sequence against a database with phmmer, or do an iterative search with jackhmmer. + +HMMER is designed to detect remote homologs as sensitively as possible, relying on the strength of its underlying probability models. In the past, this strength came at significant computational expense, but as of the new HMMER3 project, HMMER is now essentially as fast as BLAST. + +HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. + ''; + homepage = http://hmmer.org/; + license = licenses.gpl3; + maintainers = [ maintainers.iimog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc2589c7538..8615fa81c718 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20169,6 +20169,8 @@ with pkgs; varscan = callPackage ../applications/science/biology/varscan { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; + bwa = callPackage ../applications/science/biology/bwa { }; ### SCIENCE/MACHINE LEARNING From eee50238c750d265ade122a61918ecb006dcc4bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Jun 2018 16:59:17 +0200 Subject: [PATCH 097/312] multi-ghc-travis: update to current git HEAD --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 697af75a434e..3f64f4a925f1 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -18,8 +18,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "05926968f17256cae2308756835a3a24d9de437b"; - sha256 = "0s1g1yq6j6vl2bspc90bwbwp7532pcrmh8fhnz8j6yv9py927mmm"; + rev = "b592d290cff68c7abcbd7f99f41aac998e7b7916"; + sha256 = "0jwaifp9wx6lb27qj191hjm125kq3vndh5lf7ibd86x19h5zmy4c"; }; patches = [ newShellCheck ]; isLibrary = true; From 6056c0672180ff6237f626e990a6db6e17d76f9b Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sun, 24 Jun 2018 22:38:47 +0200 Subject: [PATCH 098/312] krop: init -> 0.5.0 --- pkgs/applications/graphics/krop/default.nix | 40 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/graphics/krop/default.nix diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix new file mode 100644 index 000000000000..2858086e0d64 --- /dev/null +++ b/pkgs/applications/graphics/krop/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }: + +python3Packages.buildPythonApplication rec { + pname = "krop"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "arminstraub"; + repo = pname; + rev = "v${version}"; + sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + libsForQt5.poppler + ghostscript + ]; + + # Disable checks because of interference with older Qt versions // xcb + doCheck = false; + + meta = { + homepage = http://arminstraub.com/software/krop; + description = "Graphical tool to crop the pages of PDF files"; + longDescription = '' + Krop is a tool that allows you to optimise your PDF files, and remove + sections of the page you do not want. A unique feature of krop, at least to my + knowledge, is its ability to automatically split pages into subpages to fit the + limited screensize of devices such as eReaders. This is particularly useful, if + your eReader does not support convenient scrolling. Krop also has a command line + interface. + ''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ leenaars ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf2d83fe3fc..321775d441e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3327,6 +3327,8 @@ with pkgs; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + krop = callPackage ../applications/graphics/krop { }; + elisa = libsForQt5.callPackage ../applications/audio/elisa { }; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; From 39e95d1c0c06bd149a1dea5fb3cefec210477847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Jun 2018 17:13:49 +0200 Subject: [PATCH 099/312] newsboat: 2.11.1 -> 2.12 --- pkgs/applications/networking/feedreaders/newsboat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 24fed4ca8521..f10a88ec9614 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.11.1"; + version = "2.12"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; + sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv"; }; prePatch = '' From bda7c2fd4b610561137414c397ea97093f29266f Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 25 Jun 2018 11:45:18 -0400 Subject: [PATCH 100/312] gringo: use postPatch patchPhase overrides the patches thing. --- pkgs/tools/misc/gringo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 76c60023c063..6c5bac11e738 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gringo-4.5.4-to_string.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ From f3693b06470bdd484a06bf8b25bffe059dcb7ae4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 11:16:10 -0500 Subject: [PATCH 101/312] make-bootstrap-tools-cross: remove broken i686-musl variant Not terribly difficult to get this working, but until it does remove it so the cross jobset doesn't have the failures this introduces. --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6c217be4ea3c..0dd65bd2478d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -14,7 +14,6 @@ in with (import ../../../lib).systems.examples; { armv7l = make armv7l-hf-multiplatform; aarch64 = make aarch64-multiplatform; x86_64-musl = make musl64; - i686-musl = make musl32; armv6l-musl = make muslpi; aarch64-musl = make aarch64-multiplatform-musl; riscv64 = make riscv64; From 3a6b91fa903c9a0c919acd97539ebc018fdab9a7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 10:53:12 -0500 Subject: [PATCH 102/312] glib: also add gobject init patch to fix w/musl --- pkgs/development/libraries/glib/default.nix | 6 +- .../glib/gobject_init_on_demand.patch | 87 +++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/glib/gobject_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index a793bf5f7521..ff870f525f23 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,8 +54,10 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch - ++ optional stdenv.hostPlatform.isMusl ./quark_init_on_demand.patch - ++ [ ./schema-override-variable.patch ]; + ++ optionals stdenv.hostPlatform.isMusl [ + ./quark_init_on_demand.patch + ./gobject_init_on_demand.patch + ] ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/development/libraries/glib/gobject_init_on_demand.patch new file mode 100644 index 000000000000..d72d0b61dca2 --- /dev/null +++ b/pkgs/development/libraries/glib/gobject_init_on_demand.patch @@ -0,0 +1,87 @@ +--- glib-source/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 +@@ -209,6 +209,9 @@ + static gboolean type_node_is_a_L (TypeNode *node, + TypeNode *iface_node); + ++#if !defined(__GLIBC__) ++static void gobject_init (void); ++#endif + + /* --- enumeration --- */ + +@@ -2631,7 +2634,10 @@ + GTypeFlags flags) + { + TypeNode *node; +- ++ ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (type_id > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2749,6 +2755,9 @@ + TypeNode *pnode, *node; + GType type = 0; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2804,6 +2813,9 @@ + TypeNode *pnode, *node; + GType type; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -3319,6 +3331,9 @@ + { + TypeNode *node; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + node = lookup_type_node_I (type); +@@ -4343,6 +4358,9 @@ + void + g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + if (debug_flags) +@@ -4361,6 +4379,9 @@ + void + g_type_init (void) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + } + +@@ -4372,6 +4393,12 @@ + TypeNode *node; + GType type; + ++#if !defined(__GLIBC__) ++ static int gobject_initialized = 0; ++ if (gobject_initialized) ++ return; ++ gobject_initialized = 1; ++#endif + /* Ensure GLib is initialized first, see + * https://bugzilla.gnome.org/show_bug.cgi?id=756139 + */ From d92f73e8db803602a569e9fabc7a741564f85e45 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Jun 2018 17:37:43 +0300 Subject: [PATCH 103/312] rocket: Init at 2018-06-09 --- pkgs/tools/graphics/rocket/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/graphics/rocket/default.nix diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix new file mode 100644 index 000000000000..513439989501 --- /dev/null +++ b/pkgs/tools/graphics/rocket/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase }: + +stdenv.mkDerivation rec { + name = "rocket-${version}"; + version = "2018-06-09"; + + src = fetchFromGitHub { + owner = "rocket"; + repo = "rocket"; + rev = "7bc1e9826cad5dbc63e56371c6aa1798b2a7b50b"; + sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + + configurePhase = ":"; + + installPhase = '' + mkdir -p $out/bin + cp -r editor/editor $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A tool for synchronizing music and visuals in demoscene productions"; + homepage = "https://github.com/rocket/rocket"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6432030ee47..50736caab838 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4639,6 +4639,8 @@ with pkgs; remarshal = callPackage ../development/tools/remarshal { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { }; rtmidi = callPackage ../development/libraries/audio/rtmidi { }; From 6a2df77563de3869bd0b6b8efdbea33ff8750340 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Jun 2018 13:21:36 -0400 Subject: [PATCH 104/312] typora: XDG_RUNTIME_DIR doesn't need to be set --- pkgs/applications/editors/typora/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index efde7242793d..d07b1ba0ae51 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/typora \ "''${gappsWrapperArgs[@]}" \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \ --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share" # Fix the desktop link From 2052323a7884c73fc7a137691b9690d821b906a6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 11:34:57 -0500 Subject: [PATCH 105/312] ghc-8.4.3: minor fixes for cross-musl, same as used with 8.2.2 Patches are no longer needed, seem to be more or less upstreamed. --- pkgs/development/compilers/ghc/8.4.3.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 4d2f3894f178..10035af90a89 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -49,7 +49,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO From 5d99d322e94d3a8f728413013a36bb43197262a3 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 20 Jun 2018 19:48:12 -0700 Subject: [PATCH 106/312] clightning: init at 0.6 c-lightning is a standard compliant implementation of the Lightning Network protocol. The Lightning Network is a scalability solution for Bitcoin, enabling secure and instant transfer of funds between any two parties for any amount. --- pkgs/applications/altcoins/clightning.nix | 47 +++++++++++++++++++++++ pkgs/applications/altcoins/default.nix | 1 + pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/applications/altcoins/clightning.nix diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix new file mode 100644 index 000000000000..73cdd3664ea5 --- /dev/null +++ b/pkgs/applications/altcoins/clightning.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake, + autogen, git, sqlite, gmp, zlib, fetchFromGitHub }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "clightning-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "ElementsProject"; + repo = "lightning"; + rev = "v${version}"; + sha256 = "1xbi8c7kn21wj255fxnb9s0sqnzbn3wsz4p96z084k8mw1nc71vn"; + }; + + enableParallelBuilding = true; + + buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ]; + + makeFlags = [ "prefix=$(out)" ]; + + configurePhase = '' + ./configure --prefix=$out --disable-developer --disable-valgrind + ''; + + postPatch = '' + echo "" > tools/refresh-submodules.sh + patchShebangs tools/generate-wire.py + ''; + + doCheck = false; + + meta = { + description = "A Bitcoin Lightning Network implementation in C"; + longDescription= '' + c-lightning is a standard compliant implementation of the Lightning + Network protocol. The Lightning Network is a scalability solution for + Bitcoin, enabling secure and instant transfer of funds between any two + parties for any amount. + ''; + homepage = https://github.com/ElementsProject/lightning; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1a0e77dc12f1..385e9e53522d 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -6,6 +6,7 @@ rec { bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ./clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1c73cd8d999..57488110a4a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15012,7 +15012,10 @@ with pkgs; schismtracker = callPackage ../applications/audio/schismtracker { }; altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); + bitcoin = altcoins.bitcoin; + clightning = altcoins.clightning; + bitcoin-xt = altcoins.bitcoin-xt; cryptop = altcoins.cryptop; From 32628d18c3aacd0fbadd9d81ac8613a3f2e302fd Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Mon, 25 Jun 2018 21:18:57 +0200 Subject: [PATCH 107/312] xidlehook: 0.4.8 -> 0.4.9 (#42573) --- pkgs/tools/X11/xidlehook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e22338dbc718..2faa8ead0716 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.8"; + version = "0.4.9"; doCheck = false; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh"; + sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; From 68bf1063f02d7c1e6b2caa7cf725b884f1865296 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 25 Jun 2018 22:29:25 +0300 Subject: [PATCH 108/312] rambox: fix build (#42577) --- .../instant-messengers/rambox/bare.nix | 5 ++--- .../instant-messengers/rambox/default.nix | 5 ++--- .../rambox/disable-tooltips.patch | 19 ------------------- .../instant-messengers/rambox/sencha/bare.nix | 2 +- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 49cd81ac923c..334c50814d78 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha -, auth0ClientID, auth0Domain, disableTooltips }: +, auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./isDev.patch ] - ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; + patches = [ ./isDev.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index a601db8c8da5..b6e9c9210251 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,14 +1,13 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" -, disableTooltips ? false }: +, auth0Domain ? "nixpkgs.auth0.com" }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain disableTooltips; + inherit auth0ClientID auth0Domain; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch deleted file mode 100644 index 5ddaa9d51771..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- index.html.orig 2017-12-16 20:06:03.401298402 +0300 -+++ ./index.html 2017-12-16 20:06:21.474484436 +0300 -@@ -43,14 +43,14 @@ - - - -- --> - - - diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 46157178fc1a..ca82f30e2d1f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3"; + version = "6.5.3.6"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; From 2f2e79be39e8c0ca2a520b2a2352ff59a99b1797 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 25 Jun 2018 22:05:53 +0200 Subject: [PATCH 109/312] haskellPackages: disable profiling ghc-heap-view ghc-datasize --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20a908858e9c..439e033acb0d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -61,6 +61,10 @@ self: super: { statistics = dontCheck super.statistics; vector-builder = dontCheck super.vector-builder; + # These packages (and their reverse deps) cannot be built with profiling enabled. + ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; + ghc-datasize = disableLibraryProfiling super.ghc-datasize; + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; From 449fbec9be1865fca59e973f05dd06d213820c5e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 15:47:22 -0500 Subject: [PATCH 110/312] ghcHEAD: add musl and cross fixes recently applied to 8.4.3 and 8.2.2 --- pkgs/development/compilers/ghc/head.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ccd72ef55a2..ec9ff56c4585 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -50,7 +50,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO From 61e3bd20a04f9199744e9d0f38b3b7a5d442bdbd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 15:49:00 -0500 Subject: [PATCH 111/312] ghcHEAD: move hardeningDisable definition for cleaner diff against 8.4.3 NFCI (no functionality change intendend) --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ec9ff56c4585..a71b08cd39fc 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -167,10 +167,10 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - hardeningDisable = [ "format" ]; - checkTarget = "test"; + hardeningDisable = [ "format" ]; + postInstall = '' for bin in "$out"/lib/${name}/bin/*; do isELF "$bin" || continue From 0e40e0cc7d4748c3a1c66e2b37f0d95b9ffc0772 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 15:49:32 -0500 Subject: [PATCH 112/312] ghcHEAD: useLLVM needed for musl here as well --- pkgs/development/compilers/ghc/head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a71b08cd39fc..43e6473fc241 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From 73e2f608377a81b7ad3ff94c3e5586bded36ac71 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 22 Jun 2018 21:49:41 -0400 Subject: [PATCH 113/312] libiconv: add "enableShared" option When false, shared libraries will be disabled. also adds patch to *really* disable shared libiconv. --- pkgs/development/libraries/libiconv/default.nix | 9 +++++++-- .../apple-source-releases/libiconv/default.nix | 14 +++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 169a4d38bb53..0e900ca9db64 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableShared ? !stdenv.hostPlatform.useAndroidPrebuilt }: # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross @@ -23,10 +24,14 @@ stdenv.mkDerivation rec { lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h - ''; + '' + + lib.optionalString (!enableShared) '' + sed -i -e '/preload/d' Makefile.in + ''; configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static"; + ++ lib.optional enableStatic "--enable-static" + ++ lib.optional (!enableShared) "--disable-shared"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index bb9e4fa755db..369556fd5a1c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,15 +1,19 @@ -{ stdenv, appleDerivation, autoreconfHook, targetPlatform, enableStatic ? targetPlatform.isiOS }: +{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform +, enableStatic ? targetPlatform.isiOS +, enableShared ? !targetPlatform.isiOS +}: appleDerivation { postUnpack = "sourceRoot=$sourceRoot/libiconv"; - preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS '' + preConfigure = lib.optionalString stdenv.hostPlatform.isiOS '' sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = stdenv.lib.optionals enableStatic [ "--enable-static" "--disable-shared" ]; + configureFlags = lib.optional enableStatic "--enable-static" + ++ lib.optional (!enableShared) "--disable-shared"; - postInstall = stdenv.lib.optionalString (!enableStatic) '' + postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib @@ -26,6 +30,6 @@ appleDerivation { ]; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } From 7652b2ef16375ed1e38056c69da4125b0c25c3f2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Jun 2018 16:33:20 -0400 Subject: [PATCH 114/312] android: add --build-id to ldflags the gcc in android does not have this on by default. Doing this will fix some of the errors in cross-trunk: https://hydra.nixos.org/build/76354538/nixlog/11 This is related to how separate debug info is handled in Nixpkgs. --- pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 5c42f7bc3289..011b8eb00994 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -58,6 +58,9 @@ rec { binutils = wrapBintoolsWith { bintools = binaries; libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = '' + echo "--build-id" >> $out/nix-support/libc-ldflags + ''; }; gcc = wrapCCWith { From d9155904b347679163c6fe6702f8ec6384bd8c40 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Jun 2018 16:42:10 -0400 Subject: [PATCH 115/312] androidndk: add fullNDK option Setting this to true will disable removing some of the unused parts of the NDK toolchain that is unused in Nixpkgs but may be used by others. /cc @bkchr --- pkgs/development/mobile/androidenv/androidndk.nix | 6 ++++++ pkgs/development/mobile/androidenv/androidndk_r8e.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 150d8d758699..1e8ea65c73d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools, python3, libcxx, version, sha256 +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -55,11 +58,14 @@ stdenv.mkDerivation rec { } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm* + '' + + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 44fa961b992f..3c12e16277d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -49,11 +52,13 @@ stdenv.mkDerivation rec { -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm-* + '' + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ From 2c2169c8810a5be2456ed2340efb8a8064e1db2b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Jun 2018 16:48:03 -0400 Subject: [PATCH 116/312] ghc: build shared on android We run into issues otherwise --- pkgs/development/compilers/ghc/8.4.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 10035af90a89..702bf1cf9b96 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows From 5000cc555eb35292e3819f73ee497957d1311ab0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Jun 2018 19:15:36 -0400 Subject: [PATCH 117/312] android: define __ANDROID_API__ in cflags This is needed for targeting older apis. --- pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 011b8eb00994..0f43705c0d42 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -67,7 +67,10 @@ rec { cc = binaries; bintools = binutils; libc = targetAndroidndkPkgs.libraries; - extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let + extraBuildCommands = '' + echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + '' + + lib.optionalString targetPlatform.isAarch32 (let p = targetPlatform.platform.gcc or {} // targetPlatform.parsed.abi; flags = lib.concatLists [ From 31eac6fd0088710c193efebb632f1c97ef3045a6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Jun 2018 23:15:09 -0400 Subject: [PATCH 118/312] impure.nix: fix handling of localSystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we passed a localSystem in, we don’t want the current system to override it. Now we check for localSystem first to avoid getting "mixed" localSystem values from commands like this: nix-build --arg localSystem '{config="x86_64-unknown-linux-musl";}' -A hello Which would eventually evaluate localSystem to this: { config = "x86_64-unknown-linux-musl"; system = "x86_64-darwin"; } & Nix would not be able to run it correctly. Fixes #41599 /cc @Ericson2314 --- pkgs/top-level/impure.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index df462665dd16..dafa351c4e41 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -83,5 +83,6 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. - localSystem = { system = builtins.currentSystem; } // localSystem; + localSystem = (if args ? localSystem then {} + else { system = builtins.currentSystem; }) // localSystem; }) From 69cad91b5c34b9ff474e973d39dd114cd91e6e82 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 09:38:16 -0400 Subject: [PATCH 119/312] =?UTF-8?q?ghc843:=20don=E2=80=99t=20apply=20strip?= =?UTF-8?q?ping=20in=20android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This breaks some library symbols apparently. ARM symbols must be incorrectly stripped. Also some very weird issues with patchelf. --- pkgs/development/compilers/ghc/8.4.3.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 702bf1cf9b96..0f5a43d57eda 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -75,7 +75,7 @@ let targetCC = builtins.head toolsForTarget; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "8.4.3"; name = "${targetPrefix}ghc-${version}"; @@ -209,4 +209,8 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) From a47a16a887630c52d7c6b5c63ec07b5614dbd4a0 Mon Sep 17 00:00:00 2001 From: tim put Date: Mon, 25 Jun 2018 16:12:26 -0600 Subject: [PATCH 120/312] openmvg: 1.1 -> 1.3 --- pkgs/applications/science/misc/openmvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index b139f30b3d18..0f0c6aaf74da 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -8,7 +8,7 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.3"; name = "openmvg-${version}"; src = fetchgit { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Tag v1.1 rev = "refs/tags/v${version}"; - sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f"; + sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb"; fetchSubmodules = true; }; From 2c766d8765c8522d053cf7f1a4aa7ba0f407296d Mon Sep 17 00:00:00 2001 From: tim put Date: Mon, 25 Jun 2018 16:13:26 -0600 Subject: [PATCH 121/312] add timput to maintainers --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d99ce88d61ef..8a075ba35b60 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3871,6 +3871,11 @@ github = "timor"; name = "timor"; }; + timput = { + email = "tim@timput.com"; + github = "TimPut"; + name = "Tim Put"; + }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; From 1fe63c8ad119f3789d14fb208529ed83987bd356 Mon Sep 17 00:00:00 2001 From: laMudri Date: Mon, 25 Jun 2018 23:15:01 +0100 Subject: [PATCH 122/312] nixos/ibus: detail workaround for issue #11558 --- nixos/modules/i18n/input-method/default.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 45d6daf068b3..c44105c8749f 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -68,6 +68,18 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ]; To use any input method, the package must be added in the configuration, as shown above, and also (after running nixos-rebuild) the input method must be added from IBus' preference dialog. + + + Troubleshooting + If IBus works in some applications but not others, a likely cause of + this is that IBus is depending on a different version of + glib to what the applications are depending on. This can + be checked by running nix-store -q --requisites <path> | grep + glib, where <path> is the path of either + IBus or an application in the Nix store. The glib + packages must match exactly. If they do not, uninstalling and reinstalling + the application is a likely fix. +
Fcitx From 460b9943033fd0463206ecaddd8ce5c5a32ed504 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 25 Jun 2018 22:18:34 +0000 Subject: [PATCH 123/312] perl-packages.nix: duplicate packages -> aliases --- pkgs/top-level/perl-packages.nix | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00689e1f5b2e..57c76b678ff6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4505,19 +4505,7 @@ let self = _self // overrides; _self = with self; { }; }; - DigestHMAC_SHA1 = buildPerlPackage { - name = "Digest-HMAC_SHA1-1.03"; - src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; - sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; - }; - meta = { - description = "Keyed-Hashing for Message Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + DigestHMAC_SHA1 = DigestHMAC; DigestJHash = buildPerlPackage rec { name = "Digest-JHash-0.10"; @@ -14183,20 +14171,7 @@ let self = _self // overrides; _self = with self; { }; }; - SubExporterUtil = let version = "0.987"; in buildPerlPackage { - name = "Sub-Exporter-Util-${version}"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-${version}.tar.gz"; - sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; - }; - propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; - meta = { - inherit version; - homepage = https://github.com/rjbs/sub-exporter; - description = "A sophisticated exporter for custom-built routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + SubExporterUtil = SubExporter; SubIdentify = buildPerlPackage rec { name = "Sub-Identify-0.14"; From 5d534c2663ad49f3dbdfffb27a2a550825980250 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jun 2018 01:03:56 +0200 Subject: [PATCH 124/312] cutelyst: init at 2.4.1 Co-authored-by: Maximilian Bosch Co-authored-by: elseym --- .../libraries/cutelyst/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/cutelyst/default.nix diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix new file mode 100644 index 000000000000..2d31f734166e --- /dev/null +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, qtbase, libuuid, libcap, uwsgi, grantlee }: + +stdenv.mkDerivation rec { + name = "cutelyst-${version}"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "cutelyst"; + rev = "v${version}"; + sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl"; + }; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ qtbase libuuid libcap uwsgi grantlee ]; + + cmakeFlags = [ + "-DPLUGIN_UWSGI=ON" + "-DPLUGIN_STATICCOMPRESSED=ON" + "-DPLUGIN_CSRFPROTECTION=ON" + "-DPLUGIN_VIEW_GRANTLEE=ON" + ]; + + preBuild = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/Cutelyst:`pwd`/EventLoopEPoll" + ''; + + postBuild = '' + unset LD_LIBRARY_PATH + ''; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --set QT_PLUGIN_PATH '${qtbase}/${qtbase.qtPluginPrefix}' + done + ''; + + meta = with lib; { + description = "C++ Web Framework built on top of Qt"; + homepage = https://cutelyst.org/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50736caab838..31ad7bed63f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8884,6 +8884,8 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; + cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; + cxxtools = callPackage ../development/libraries/cxxtools { }; cwiid = callPackage ../development/libraries/cwiid { }; From 1d235be2086dde14050fc811dc37528dec301783 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jun 2018 01:11:00 +0200 Subject: [PATCH 125/312] virtlyst: init at 1.1.0 Co-authored-by: elseym --- .../virtlyst/add-admin-password-env.patch | 14 ++++++++ pkgs/servers/web-apps/virtlyst/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch create mode 100644 pkgs/servers/web-apps/virtlyst/default.nix diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch new file mode 100644 index 000000000000..e20acdb04a9e --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch @@ -0,0 +1,14 @@ +diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp +index acd195d..8809e4f 100644 +--- a/src/virtlyst.cpp ++++ b/src/virtlyst.cpp +@@ -340,7 +340,8 @@ bool Virtlyst::createDB() + qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); + return false; + } +- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); ++ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", ++ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); + query.bindValue(QStringLiteral(":password"), QString::fromLatin1( + CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); + if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix new file mode 100644 index 000000000000..c6245f9b40d2 --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +, qtbase, libvirt, cutelyst, grantlee }: + +stdenv.mkDerivation rec { + name = "virtlyst-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "Virtlyst"; + rev = "v${version}"; + sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + }; + + nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + buildInputs = [ qtbase libvirt cutelyst grantlee ]; + + installPhase = '' + mkdir -p $out/lib + cp src/libVirtlyst.so $out/lib + cp -r ../root $out + ''; + + patches = [ ./add-admin-password-env.patch ]; + + meta = with lib; { + description = "Web interface to manage virtual machines with libvirt"; + homepage = https://github.com/cutelyst/Virtlyst; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31ad7bed63f0..9cae3fa291da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13171,6 +13171,8 @@ with pkgs; unifiTesting; unifi = unifiStable; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; From 2ef3ae559068c1ea495ec1fa007c9acd00575611 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jun 2018 01:16:51 +0200 Subject: [PATCH 126/312] virtlyst service: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/virtlyst.nix | 72 ++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 nixos/modules/services/web-apps/virtlyst.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193ef0d1c961..c425f3c65075 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -662,6 +662,7 @@ ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix ./services/web-apps/quassel-webserver.nix + ./services/web-apps/virtlyst.nix ./services/web-apps/youtrack.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix new file mode 100644 index 000000000000..2fc67435ce82 --- /dev/null +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.virtlyst; + stateDir = "/var/lib/virtlyst"; + + ini = pkgs.writeText "virtlyst-config.ini" '' + [wsgi] + master = true + threads = auto + http-socket = ${cfg.httpSocket} + application = ${pkgs.virtlyst}/lib/libVirtlyst.so + chdir2 = ${stateDir} + static-map = /static=${pkgs.virtlyst}/root/static + + [Cutelyst] + production = true + DatabasePath = virtlyst.sqlite + TemplatePath = ${pkgs.virtlyst}/root/src + + [Rules] + cutelyst.* = true + virtlyst.* = true + ''; + +in + +{ + + options.services.virtlyst = { + enable = mkEnableOption "Virtlyst libvirt web interface"; + + adminPassword = mkOption { + type = types.str; + description = '' + Initial admin password with which the database will be seeded. + ''; + }; + + httpSocket = mkOption { + type = types.str; + default = "localhost:3000"; + description = '' + IP and/or port to which to bind the http socket. + ''; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.virtlyst = { + home = stateDir; + createHome = true; + group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; + }; + + systemd.services.virtlyst = { + wantedBy = [ "multi-user.target" ]; + environment = { + VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; + }; + serviceConfig = { + ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; + User = "virtlyst"; + WorkingDirectory = stateDir; + }; + }; + }; + +} From 3be343d34025f4cb3e68b221700ebeabbea722bf Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 25 Jun 2018 23:34:53 +0000 Subject: [PATCH 127/312] perl-packages.nix: duplicate packages -> aliases --- pkgs/top-level/perl-packages.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57c76b678ff6..44d50aefefcb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -507,21 +507,14 @@ let self = _self // overrides; _self = with self; { sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza"; }; buildInputs = [ TestMockModule ]; - }; - - ArchiveZip_1_53 = buildPerlPackage { - name = "Archive-Zip-1.60"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; - sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b"; - }; meta = { description = "Provide an interface to ZIP archive files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestMockModule ]; }; + ArchiveZip_1_53 = ArchiveZip; + AudioScan = buildPerlPackage rec { name = "Audio-Scan-1.00"; src = fetchurl { From b385d0469777f77907d365b61c0ef4a51769136e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 25 Jun 2018 20:14:03 -0400 Subject: [PATCH 128/312] linux: 4.18-rc1 -> 4.18-rc2 --- 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 d1732af9f5eb..5e8059bb4655 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc1"; - modDirVersion = "4.18.0-rc1"; + version = "4.18-rc2"; + modDirVersion = "4.18.0-rc2"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr"; + sha256 = "04vflzj14wvvkj3lsbabsw0239y58cdd8g5kciqz1ydhdlgifpza"; }; # Should the testing kernels ever be built on Hydra? From 653e63ac4eee9abd3b00ccaec2807cdbbfe18dac Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Jun 2018 20:22:20 -0400 Subject: [PATCH 129/312] typora: 0.9.48 -> 0.9.53 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index d07b1ba0ae51..082bc2a2536c 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.48"; + version = "0.9.53"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800"; + sha256 = "02k6x30l4mbjragqbq5rn663xbw3h4bxzgppfxqf5lwydswldklb"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d"; + sha256 = "1wyq1ri0wwdy7slbd9dwyrdynsaa644x44c815jl787sg4nhas6y"; } ; From 9b0b31d9813220de53e950d0f207a3b874dc0780 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 22 Jun 2018 17:20:00 -0400 Subject: [PATCH 130/312] xcode: add xcodeVer to system This version number controls which xcode version to use when building cross to iOS. --- lib/systems/examples.nix | 4 ++++ pkgs/os-specific/darwin/xcode/default.nix | 8 ++++---- pkgs/top-level/darwin-packages.nix | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 108996206a7d..1817a6380ddd 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -100,6 +100,7 @@ rec { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; sdkVer = "10.2"; + xcodeVer = "8.2"; useiOSPrebuilt = true; platform = {}; }; @@ -108,6 +109,7 @@ rec { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; sdkVer = "10.2"; + xcodeVer = "8.2"; useiOSPrebuilt = true; platform = {}; }; @@ -116,6 +118,7 @@ rec { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; sdkVer = "10.2"; + xcodeVer = "8.2"; useiOSPrebuilt = true; isiPhoneSimulator = true; platform = {}; @@ -125,6 +128,7 @@ rec { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; sdkVer = "10.2"; + xcodeVer = "8.2"; useiOSPrebuilt = true; isiPhoneSimulator = true; platform = {}; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d153ef16c14e..252fe5abf49f 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ stdenv, requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let @@ -40,11 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in rec { +in lib.makeExtensible (self: { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = xcode_9_4; -} + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; +}) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a1d5772fe6da..03a32260710a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -47,7 +47,7 @@ in iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; - xcode = darwin.xcode_8_2; + xcode = darwin.xcode; inherit (pkgs.llvmPackages) clang-unwrapped; }; From 0bfffbc5e19f1a16c19f3cec5272174555006869 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 22:18:23 -0400 Subject: [PATCH 131/312] xcode: add xcodePlatform to system This give us a little bit more control over what target we are using. Eventually we can target other things like WatchOS or MacOS. --- lib/systems/default.nix | 1 - lib/systems/examples.nix | 6 ++++-- .../{ios-sdk-pkgs/default.nix => xcode/sdk-pkgs.nix} | 11 +++++++---- pkgs/top-level/darwin-packages.nix | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) rename pkgs/os-specific/darwin/{ios-sdk-pkgs/default.nix => xcode/sdk-pkgs.nix} (71%) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ee4c29660a55..5eacc9eb23e1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -46,7 +46,6 @@ rec { # Misc boolean options useAndroidPrebuilt = false; useiOSPrebuilt = false; - isiPhoneSimulator = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 1817a6380ddd..31772ba0054d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -101,6 +101,7 @@ rec { # config = "aarch64-apple-darwin14"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -110,6 +111,7 @@ rec { # config = "arm-apple-darwin10"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -119,8 +121,8 @@ rec { # config = "x86_64-apple-darwin14"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; @@ -129,8 +131,8 @@ rec { # config = "i386-apple-darwin11"; sdkVer = "10.2"; xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix similarity index 71% rename from pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix rename to pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index ebca738431c3..d5ed21cd9e24 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -25,9 +25,9 @@ rec { sdk = rec { name = "ios-sdk"; type = "derivation"; - outPath = xcode + "/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk"; + outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS"; + platform = targetPlatform.xcodePlatform; version = targetPlatform.sdkVer; }; @@ -48,7 +48,10 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags - echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { inherit sdk; @@ -60,7 +63,7 @@ rec { }; } '' if ! [ -d ${sdk} ]; then - echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2 + echo "You must have version ${sdk.version} of the ${sdk.platform} sdk installed at ${sdk}" >&2 exit 1 fi ln -s ${sdk}/usr $out diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 03a32260710a..047eab83bb42 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -44,7 +44,7 @@ in insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { + iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; xcode = darwin.xcode; From 789ecf9112481c3caa1d2893be2bf417c3c80748 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Jun 2018 21:29:50 -0700 Subject: [PATCH 132/312] hwinfo: 21.53 -> 21.55 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hwinfo/versions. These checks were done: - built on NixOS - /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/hwinfo passed the binary check. - /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/check_hd passed the binary check. - Warning: no invocation of /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/mk_isdnhwdb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/convert_hd had a zero exit code or showed the expected version - /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55/bin/getsysinfo passed the binary check. - 3 of 5 passed binary check by having a zero exit code. - 1 of 5 passed binary check by having the new version present in output. - found 21.55 with grep in /nix/store/hl1s37xgnvmc7i9qixpfpmib9h1xb9m5-hwinfo-21.55 - directory tree listing: https://gist.github.com/75d50331352f1d07e8c3bb5ed608c696 - du listing: https://gist.github.com/91d956e9c9e9765872e9d3c7f33d72f0 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 839be268b5b4..73adb0828028 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.53"; + version = "21.55"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady"; + sha256 = "005xf5j2bbalsi6z2j9q9r4zf80a04f7mz0bd2jyb8rh3lnac6w8"; }; patchPhase = '' From 155a4005ef41b8d63e99085f150d8b4bc313d403 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 22:38:13 -0700 Subject: [PATCH 133/312] mbedtls: 2.10.0 -> 2.11.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 ed1052ce40a0..152d7bdc37b3 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.10.0"; + name = "mbedtls-2.11.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk"; + sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; }; nativeBuildInputs = [ perl ]; From 78cda56bb898fa53c242a4a9381561e73d362616 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 22:40:26 -0700 Subject: [PATCH 134/312] neomutt: 20180512 -> 20180622 --- .../applications/networking/mailreaders/neomutt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2ae58721188e..33ccec355117 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180512"; + version = "20180622"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl"; + sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180512 so we disable them for now. + # that has tests (20180223) as well as 20180622 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c From 7b4cf6b8e72863d564c0094363aeb137e974f76b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Jun 2018 16:05:54 +0200 Subject: [PATCH 135/312] lief: init at 0.9.0 --- pkgs/development/libraries/lief/default.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/lief/default.nix diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix new file mode 100644 index 000000000000..410c60bff9f3 --- /dev/null +++ b/pkgs/development/libraries/lief/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchzip }: + +fetchzip { + url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz; + sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; + + meta = with stdenv.lib; { + description = "Library to Instrument Executable Formats"; + homepage = https://lief.quarkslab.com/; + license = [ licenses.asl20 ]; + platforms = platforms.linux; + maintainers = [ maintainers.lassulus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bc2589c7538..78a9a8dde5ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1353,6 +1353,8 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + lief = callPackage ../development/libraries/lief {}; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; From 065200f0b134ef5bf698de8d496d926461a870fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 22:41:30 -0700 Subject: [PATCH 136/312] syslogng: 3.15.1 -> 3.16.1 --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index b47f5c98c4d2..4f3795cf54c9 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.15.1"; + version = "3.16.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2"; + sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7"; }; nativeBuildInputs = [ pkgconfig which ]; From f13dd0ee3eee6c0fdc4c3fdc298ad9dd9c46e2be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 22:42:12 -0700 Subject: [PATCH 137/312] xmrig-proxy: 2.6.2 -> 2.6.3 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 4e1e505e035e..aacf71e17b6c 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh"; + sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn"; }; nativeBuildInputs = [ cmake ]; From ccca30790bbd0783684007c5d3ddefad19244b1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 Jun 2018 22:42:49 -0700 Subject: [PATCH 138/312] urh: 2.1.0 -> 2.1.1 --- pkgs/applications/misc/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 1a9cd2a12525..cf461c498c1c 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0i01pj71p3lc1kcqj6mixax6865vbxd9k9jczi2xh4p9nmfa5m2a"; + sha256 = "1n8nkrydic2zkglz9hyrf28np3v42b4xwia068b29szivr9fmnrn"; }; buildInputs = [ hackrf rtl-sdr ]; From 41c05a72a745d1d0ef897a1427157c2f0f4a5b22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 26 Jun 2018 00:02:31 -0700 Subject: [PATCH 139/312] libpfm: 4.10.0 -> 4.10.1 (#42489) --- pkgs/development/libraries/libpfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 593bb567df7d..25e55e45d1e2 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.10.0"; + version = "4.10.1"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0bldxhcrpav04hi256fmf907gxhyck24j1p998v48zbhm6aykw94"; + sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; From 3a2e601efd8d43ad35e5340aeb6b815086229d84 Mon Sep 17 00:00:00 2001 From: pandaman64 Date: Tue, 26 Jun 2018 16:55:08 +0900 Subject: [PATCH 140/312] qiskit: fix build --- .../development/python-modules/qiskit/setup.py.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch index bb7cb71ae098..9c4224ce64c6 100644 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ b/pkgs/development/python-modules/qiskit/setup.py.patch @@ -1,19 +1,21 @@ --- a/setup.py +++ b/setup.py -@@ -28,11 +28,11 @@ from setuptools.dist import Distribution +@@ -18,13 +18,13 @@ from setuptools.dist import Distribution requirements = [ - "IBMQuantumExperience>=1.8.29", + "IBMQuantumExperience>=1.9.2", - "matplotlib>=2.1,<2.2", - "networkx>=2.0,<2.1", - "numpy>=1.13,<1.15", - "ply==3.10", -- "scipy>=0.19,<1.1", +- "scipy>=0.19,<1.2", +- "sympy>=1.0,<1.2", +- "pillow>=4.2.1,<5.2" + "matplotlib>=2.1", + "networkx>=2.0", + "numpy>=1.13", + "ply>=3.10", + "scipy>=0.19", - "sympy>=1.0", - "pillow>=4.2.1" ++ "sympy>=1.0", ++ "pillow>=4.2.1" ] From 6b6ccebc6f2016e6e98e77ec3fbd9199680457a2 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Tue, 26 Jun 2018 17:58:33 +1000 Subject: [PATCH 141/312] bazel: fix darwin --- .../tools/build-managers/bazel/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8cb137aeda35..28214e94c7aa 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; + char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -71,10 +71,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends ''; dontStrip = true; From a346f153b5aec465222bb23dd7a7b6178a819e1f Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 26 Jun 2018 10:02:07 +0200 Subject: [PATCH 142/312] nixos/strongswan-swanctl: Fix build of manual Commit 401370287a9b74fc18539fe9c0bdc7ac9df9cf22 introduced a small error where the closing tag of was an opening tag instead. Signed-off-by: aszlig Cc: @basvandijk, @xeji --- .../services/networking/strongswan-swanctl/swanctl-params.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index e65616332640..b16d299917fe 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -942,7 +942,7 @@ in { Enable hardware offload for this CHILD_SA, if supported by the IPsec implementation. The value yes enforces offloading and the installation will fail if it's not supported by either kernel or - device. The value auto enables offloading, if it's + device. The value auto enables offloading, if it's supported, but the installation does not fail otherwise. ''; From db319effa059bc9acf1dcc42e44b6e1b463684c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Jun 2018 02:31:13 +0200 Subject: [PATCH 143/312] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/31a9e4f9aeda116ca917bae59082d98a92f475aa. --- .../haskell-modules/hackage-packages.nix | 1117 ++++++++++++++--- 1 file changed, 928 insertions(+), 189 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55cd821e1a2c..cc143df86607 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17338,6 +17338,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "StrictCheck" = callPackage + ({ mkDerivation, base, bifunctors, containers, deepseq + , generics-sop, HUnit, QuickCheck, template-haskell + }: + mkDerivation { + pname = "StrictCheck"; + version = "0.1.0"; + sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z"; + libraryHaskellDepends = [ + base bifunctors containers generics-sop QuickCheck template-haskell + ]; + testHaskellDepends = [ + base deepseq generics-sop HUnit QuickCheck + ]; + description = "StrictCheck: Keep Your Laziness In Check"; + license = stdenv.lib.licenses.mit; + }) {}; + "StringUtils" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -18539,8 +18557,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.11"; - sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l"; + version = "0.1.2.12"; + sha256 = "16cakg1vyq7sfjqpbv02a44p6bf35qqidwbc07dpnaafp2qndppf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -21358,8 +21376,8 @@ self: { pname = "ad"; version = "4.3.5"; sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; - revision = "3"; - editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5"; + revision = "4"; + editedCabalFile = "0n1r7ylnabfcd3x88j93r3fjbz8hdlp3hda0zaw7h5cawc7zy01j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -23057,14 +23075,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "alarmclock_0_5_0_1" = callPackage + "alarmclock_0_5_0_2" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.5.0.1"; - sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6"; + version = "0.5.0.2"; + sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -23386,6 +23404,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "algolia" = callPackage + ({ mkDerivation, aeson, aeson-iproute, attoparsec, base, bytestring + , cryptonite, data-has, exceptions, hashable, http-client + , http-client-tls, http-types, iproute, memory, mtl, retry + , scientific, tasty, tasty-discover, tasty-hunit, text, time + , unordered-containers, uri-templater, vector + }: + mkDerivation { + pname = "algolia"; + version = "0.1.0.0"; + sha256 = "1gasyh2hv38i4936p4shmqmdxr06n785nydbxhaljrwwzih5mh3p"; + libraryHaskellDepends = [ + aeson aeson-iproute attoparsec base bytestring cryptonite data-has + exceptions hashable http-client http-client-tls http-types iproute + memory mtl retry scientific text time unordered-containers + uri-templater vector + ]; + testHaskellDepends = [ + aeson base tasty tasty-discover tasty-hunit + ]; + description = "A client implementing the Algolia search API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -30229,25 +30271,23 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filemanip, hashable - , http-client, http-client-tls, lzma, microlens, microlens-th, mtl + , dependency, dhall, directory, file-embed, filemanip, filepath + , hashable, http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.10.2.2"; - sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin"; - revision = "1"; - editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3"; + version = "2.11.0.1"; + sha256 = "03x204zmkj5ir3dfr1cc57k5gk1zdijgcdhrnq4wpnmrciqzx0js"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip hashable http-client http-client-tls lzma - microlens microlens-th mtl parallel-io process shake shake-ats + file-embed filemanip filepath hashable http-client http-client-tls + lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext tar text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; @@ -33529,8 +33569,8 @@ self: { }: mkDerivation { pname = "bdcs-api"; - version = "0.1.2"; - sha256 = "117688c8b3j32if2xc2dw9845jgpv7fxbkq3dhc56hqjlliha0fr"; + version = "0.1.3"; + sha256 = "1pjcbw7z79bvmyik6ykjha388gdcjb2h1bf3csc2yjy1g87qmq05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36551,8 +36591,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; - revision = "4"; - editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl"; + revision = "5"; + editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -37662,6 +37702,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bloodhound_0_16_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , errors, exceptions, hashable, hspec, http-client, http-types + , microlens, microlens-aeson, mtl, network-uri, pretty-simple + , QuickCheck, quickcheck-arbitrary-template, quickcheck-properties + , scientific, semigroups, semver, temporary, text, time + , transformers, unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.16.0.0"; + sha256 = "0g4x2g0qmwgfrz39iwwagrr7p19fmmz1fpfk29bkmvqvbfvsjgqz"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers exceptions hashable + http-client http-types mtl network-uri scientific semigroups semver + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers errors exceptions hspec + http-client http-types microlens microlens-aeson mtl network-uri + pretty-simple QuickCheck quickcheck-arbitrary-template + quickcheck-properties semigroups semver temporary text time + unix-compat unordered-containers vector + ]; + description = "Elasticsearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -38532,8 +38601,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "4"; - editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx"; + revision = "5"; + editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -40062,6 +40131,8 @@ self: { pname = "bytes"; version = "0.15.4"; sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; + revision = "1"; + editedCabalFile = "1ijk1d47rr4kyi3hl03v1xpb08k87wjr07d8i6gj5glhzfmmwp9k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43828,8 +43899,10 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.2"; - sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1"; + version = "0.1.1.3"; + sha256 = "0bdja5sgqv2zn7fm2cxrghs808zzx1r4wn67ln7inycjy998w2xg"; + revision = "1"; + editedCabalFile = "0m85l44fc779z9v0qwq1dj23ljkrwcd483qv9ycxdyfqwaz83a5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44212,6 +44285,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cfenv" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , raw-strings-qq + }: + mkDerivation { + pname = "cfenv"; + version = "0.1.0.0"; + sha256 = "0zklgqkm33n8a2pq8h313xij4nvrv0brh7v4q024bglyam1ndscc"; + libraryHaskellDepends = [ aeson base bytestring containers ]; + testHaskellDepends = [ + aeson base containers hspec raw-strings-qq + ]; + description = "A library getting the environment when running on Cloud Foundry"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cfipu" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , dequeue, mtl @@ -45828,8 +45917,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.1"; - sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi"; + version = "1.0.0.2"; + sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -45842,8 +45931,8 @@ self: { ({ mkDerivation, base, cl3, hmatrix }: mkDerivation { pname = "cl3-hmatrix-interface"; - version = "1.0.0.0"; - sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s"; + version = "1.0.0.1"; + sha256 = "1fixwb8y2v0zwww6p08rwsq7wfz63aj3zv2yjs9z0rp2xm3mq67w"; libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; @@ -45854,8 +45943,8 @@ self: { ({ mkDerivation, base, cl3, linear }: mkDerivation { pname = "cl3-linear-interface"; - version = "1.0.0.0"; - sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as"; + version = "1.0.0.1"; + sha256 = "1i4f9xxsdzba49h1dv8x14zz1bv1zamhvw2ngi5d6a17qd11g319"; libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; @@ -49005,8 +49094,8 @@ self: { pname = "comonad"; version = "5.0.3"; sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; - revision = "2"; - editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry"; + revision = "3"; + editedCabalFile = "062482gwrjc9njqsb239p391bk0s8j39a5xqv5k7rl9ijaxxlfmv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -51363,10 +51452,10 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, vector }: mkDerivation { pname = "constaparser"; - version = "0.1.0.0"; - sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + version = "0.1.0.1"; + sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a constant length"; + description = "Parse ByteStrings of a prescribed length"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53051,8 +53140,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.5.1"; - sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l"; + version = "3.6.0"; + sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53193,7 +53282,7 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "cql-io_1_0_0" = callPackage + "cql-io_1_0_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, monad-control, mtl @@ -53203,8 +53292,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "1.0.0"; - sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx"; + version = "1.0.1"; + sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -54853,6 +54942,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csa" = callPackage + ({ mkDerivation, base, hedgehog, hmatrix, tasty, tasty-hedgehog + , tasty-hspec + }: + mkDerivation { + pname = "csa"; + version = "0.1.0"; + sha256 = "0jnhn4lgj5l466c31h2lwslnal3ypk3ma2j75zw0ghjf35i07qvr"; + libraryHaskellDepends = [ base hmatrix ]; + testHaskellDepends = [ + base hedgehog hmatrix tasty tasty-hedgehog tasty-hspec + ]; + description = "Connection-set algebra (CSA) library"; + license = "GPL"; + }) {}; + "cse-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -55571,6 +55676,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "currencies_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "currencies"; + version = "0.2.0.0"; + sha256 = "16c4m6px6kvdr8v2k5gspjn3xag69ki6yf6ij2b3ii5rlpa94wpv"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "Currencies representation, pretty printing and conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "currency" = callPackage ({ mkDerivation, base, containers, hashable, iso3166-country-codes }: @@ -56146,16 +56264,14 @@ self: { , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm - , tar, temporary, terminfo, test-framework, test-framework-hunit + , tar, terminfo, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time, transformers, unix , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.14.0"; - sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; - revision = "1"; - editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; + version = "2.14.1"; + sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -56165,8 +56281,8 @@ self: { containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time parsec process random regex-applicative regex-compat-tdfa sandi stm - tar temporary terminfo text time transformers unix unix-compat - utf8-string vector zip-archive zlib + tar terminfo text time transformers unix unix-compat utf8-string + vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -60498,8 +60614,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.1"; - sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67"; + version = "1.0.2"; + sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -60618,6 +60734,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "detour-via-sci" = callPackage + ({ mkDerivation, aeson, base, cassava, doctest, hlint, newtype + , scientific, siggy-chardust, template-haskell + }: + mkDerivation { + pname = "detour-via-sci"; + version = "1.0.0"; + sha256 = "1r417lp98k0nizlxh7r74c2c4g1ij33pk5ip0bm7ssmzyya127j5"; + libraryHaskellDepends = [ + aeson base cassava newtype scientific siggy-chardust + template-haskell + ]; + testHaskellDepends = [ + aeson base cassava doctest hlint newtype scientific siggy-chardust + template-haskell + ]; + description = "JSON and CSV encoding for rationals as decimal point numbers"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "detour-via-uom" = callPackage + ({ mkDerivation, aeson, base, cassava, detour-via-sci, doctest + , hlint, newtype, scientific, uom-plugin + }: + mkDerivation { + pname = "detour-via-uom"; + version = "1.0.0"; + sha256 = "07jhj5mrfkfi2l05fyax6aylq4rp0nixvpsymv2xjzvbv2pfmdq7"; + libraryHaskellDepends = [ + aeson base cassava detour-via-sci newtype scientific uom-plugin + ]; + testHaskellDepends = [ + aeson base cassava detour-via-sci doctest hlint newtype scientific + uom-plugin + ]; + description = "JSON and CSV encoding for quantities"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "detrospector" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , hashable, mwc-random, text, unordered-containers, zlib @@ -61372,8 +61527,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.0.1"; - sha256 = "1x22fgmssbrda7iqz41y2dlc8jqkdiic72q490gm3kmxpd3xakjr"; + version = "0.4.0.2"; + sha256 = "1f4sapi4zhb3nrlq92lr309c4aarnl29bzghnmsvs1kqmimq23y0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63684,8 +63839,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "5"; - editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7"; + revision = "6"; + editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -64323,7 +64478,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_15_0" = callPackage + "doctest_0_16_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -64331,8 +64486,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.15.0"; - sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi"; + version = "0.16.0"; + sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64650,6 +64805,8 @@ self: { pname = "dot"; version = "0.2.2"; sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3"; + revision = "1"; + editedCabalFile = "1dc8piglcvaxj0nq946xv185ynh1bk5ca0czrw25p4hji9iji0w1"; libraryHaskellDepends = [ base impure-containers text ]; description = "Data types and encoding for graphviz dot files"; license = stdenv.lib.licenses.bsd3; @@ -65909,8 +66066,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.1"; - sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9"; + version = "0.2.0.2"; + sha256 = "1ja2pxkd5mwp404lcyk3p81y41vbwds31446gkscr2qgzrc1sb7s"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -67062,6 +67219,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egyptian-fractions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "egyptian-fractions"; + version = "0.1.0.2"; + sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv"; + libraryHaskellDepends = [ base ]; + description = "Egyptian fractions in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ehaskell" = callPackage ({ mkDerivation, base, directory, filepath, mtlparse, process , regexpr, utf8-string, yjtools @@ -71499,18 +71667,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_6_2_0" = callPackage - ({ mkDerivation, base, criterion, HUnit, monad-control, mtl - , QuickCheck, silently, test-framework, test-framework-hunit + "extensible-effects_2_6_3_0" = callPackage + ({ mkDerivation, base, criterion, doctest, HUnit, monad-control + , mtl, QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.6.2.0"; - sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f"; + version = "2.6.3.0"; + sha256 = "07syxmhyqhcbsbwwc701k5rya89pkhcjly9nrdw7mspxailbggzs"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ - base HUnit monad-control QuickCheck silently test-framework + base doctest HUnit monad-control QuickCheck silently test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; benchmarkHaskellDepends = [ @@ -71524,19 +71692,22 @@ self: { "extensible-effects-concurrent" = callPackage ({ mkDerivation, base, containers, directory, extensible-effects - , filepath, lens, logging-effect, monad-control, mtl, parallel - , process, QuickCheck, random, stm, tagged, time, transformers + , filepath, HUnit, lens, logging-effect, monad-control, mtl + , parallel, process, QuickCheck, random, stm, tagged, tasty + , tasty-discover, tasty-hunit, time, transformers }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.1.3.0"; - sha256 = "1hzl14g3s94bgnpmm3g3ypbgb66pb4m3japn1gn5z7cknxsl2xh3"; + version = "0.2.0.3"; + sha256 = "024wn3i2nxi9j4gskhjnrkqifwszfpfnn812p34krvf763vfqcn1"; libraryHaskellDepends = [ base containers directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random stm tagged time transformers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base extensible-effects HUnit stm tasty tasty-discover tasty-hunit + ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72534,6 +72705,8 @@ self: { pname = "fay-text"; version = "0.3.2.2"; sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; + revision = "1"; + editedCabalFile = "0zwip7arbrbz1qhjyy5synnlrvl2wica4804wkizpxr9l7acasn6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; @@ -73273,8 +73446,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.3.1"; - sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k"; + version = "0.4"; + sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -74964,6 +75137,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "flexible-defaults_0_0_2" = callPackage + ({ mkDerivation, base, containers, template-haskell, th-extras + , transformers + }: + mkDerivation { + pname = "flexible-defaults"; + version = "0.0.2"; + sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk"; + libraryHaskellDepends = [ + base containers template-haskell th-extras transformers + ]; + description = "Generate default function implementations for complex type classes"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flexible-time" = callPackage ({ mkDerivation, base, bytestring, unix-time }: mkDerivation { @@ -75573,6 +75762,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; + "flux-monoid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "flux-monoid"; + version = "0.1.0.0"; + sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m"; + libraryHaskellDepends = [ base ]; + description = "A monoid for tracking changes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fmark" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils }: @@ -78921,6 +79121,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_2" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , foundation, process, vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.2"; + sha256 = "0sv328c7906djwgzgg5nrpn4ag9zj5rqzxmrw5r1m1nnwzx8kcks"; + libraryHaskellDepends = [ + base basement deepseq directory process vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory foundation + ]; + benchmarkHaskellDepends = [ base ]; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -89038,8 +89258,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.0.0"; - sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz"; + version = "0.2.0.2"; + sha256 = "01nzqyk0flj4p87iin9ggvy61csvxcnby9phczahqbc0m9v5pi3h"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers vector @@ -89060,8 +89280,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.0"; - sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9"; + version = "0.1.2.1"; + sha256 = "1w3rzgkrdd62v734k4pap46780wz9q8fnr0apjvcdzga7h2685hs"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -95352,14 +95572,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_2" = callPackage + "haskeline_0_7_4_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.2"; - sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; + version = "0.7.4.3"; + sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -99284,7 +99504,7 @@ self: { license = "unknown"; }) {}; - "haxl_2_0_0_0" = callPackage + "haxl_2_0_1_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty , stm, test-framework, test-framework-hunit, text, time @@ -99292,8 +99512,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.0.0.0"; - sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy"; + version = "2.0.1.0"; + sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99576,6 +99796,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; + "hbf" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , doctest, filepath, hedgehog, hedgehog-checkers, HUnit + , optparse-applicative, parsec, primitive, smallcheck, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, tasty-smallcheck + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "hbf"; + version = "0.1.0.1"; + sha256 = "1vzzcxnc3zdqgc7g66imvq141cmnzi7513hczrqjbkim0iycxh8m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + executableHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest filepath hedgehog + hedgehog-checkers HUnit optparse-applicative parsec primitive + smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit + tasty-smallcheck temporary text transformers vector + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq filepath + optparse-applicative parsec primitive text transformers vector + ]; + description = "An optimizing Brainfuck compiler and evaluator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hblas" = callPackage ({ mkDerivation, base, blas, hspec, liblapack, primitive , storable-complex, vector @@ -100365,8 +100620,8 @@ self: { pname = "heaps"; version = "0.3.6"; sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; - revision = "2"; - editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in"; + revision = "3"; + editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; @@ -107293,22 +107548,20 @@ self: { "hpack-dhall" = callPackage ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec - , interpolate, mockery, text, transformers, trifecta + , interpolate, megaparsec, mockery, text, transformers }: mkDerivation { pname = "hpack-dhall"; - version = "0.1.0"; - sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; - revision = "3"; - editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv"; + version = "0.2.0"; + sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base dhall dhall-json hpack text transformers trifecta + aeson base dhall dhall-json hpack megaparsec text transformers ]; testHaskellDepends = [ - aeson base dhall dhall-json hpack hspec interpolate mockery text - transformers trifecta + aeson base dhall dhall-json hpack hspec interpolate megaparsec + mockery text transformers ]; description = "Dhall support for Hpack"; license = stdenv.lib.licenses.publicDomain; @@ -107736,8 +107989,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.10"; - sha256 = "14zihg4gb42kr68y73mzb7a9ryc2yi4h50n3a4v8idw17f3fdhlz"; + version = "2.4.11"; + sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112372,6 +112625,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "html-conduit_1_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.1"; + sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra containers + resourcet text transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers deepseq hspec HUnit text xml-conduit + ]; + description = "Parse HTML documents using xml-conduit datatypes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "html-email-validate" = callPackage ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text @@ -116175,8 +116449,8 @@ self: { pname = "hyphenation"; version = "0.7.1"; sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "2"; - editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk"; + revision = "3"; + editedCabalFile = "0pphkzschnqs2xj6kdg52gg2fjsg51lv0djxin8pqqjrdnyq4igy"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -117962,8 +118236,8 @@ self: { }: mkDerivation { pname = "impure-containers"; - version = "0.4.3"; - sha256 = "003r3ppwdwndg8q84bnh299f04b88bhnxxl65nbrz9xl77lfz2y0"; + version = "0.5.0"; + sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -117972,7 +118246,7 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers vector ]; benchmarkHaskellDepends = [ base criterion ]; - description = "Mutable containers in haskell"; + description = "Mutable containers in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118249,6 +118523,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "indents_0_5_0_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: + mkDerivation { + pname = "indents"; + version = "0.5.0.0"; + sha256 = "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n"; + libraryHaskellDepends = [ base mtl parsec ]; + testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; + description = "indentation sensitive parser-combinators for parsec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "index-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -118548,7 +118835,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_4" = callPackage + "influxdb_1_6_0_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -118558,8 +118845,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.4"; - sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r"; + version = "1.6.0.5"; + sha256 = "1qlc5vcd6vvrbss0nckhxkn1fbq5bfjyhc75r7di14kaww02y05l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119595,8 +119882,8 @@ self: { pname = "intervals"; version = "0.8.1"; sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; - revision = "3"; - editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95"; + revision = "4"; + editedCabalFile = "1qx3q0v13l1zaln9zdk8chxpxhshbz5x0vqm0qda7d1kpv7h6a7r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -120144,6 +120431,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.3.0"; + sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -120833,6 +121146,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iso8601-duration" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , hspec, hspec-core, QuickCheck, quickcheck-instances, time + }: + mkDerivation { + pname = "iso8601-duration"; + version = "0.1.1.0"; + sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-lexing time + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + time + ]; + description = "Types and parser for ISO8601 durations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iso8601-time" = callPackage ({ mkDerivation, base, hspec, HUnit, time }: mkDerivation { @@ -121695,6 +122027,8 @@ self: { pname = "jammittools"; version = "0.5.5"; sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; + revision = "1"; + editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124342,8 +124676,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.5.1"; - sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b"; + version = "0.6.0.0"; + sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -124375,8 +124709,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.1.0"; - sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1"; + version = "0.4.2.0"; + sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific semigroups @@ -129082,6 +129416,8 @@ self: { pname = "lens"; version = "4.16.1"; sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; + revision = "1"; + editedCabalFile = "12ycfzkc87fp787a5iq3k20mrfjd6b0r2d0dr7zscfd81sgw4shx"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -129159,8 +129495,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "5"; - editedCabalFile = "0z6ib6kndbk5dgzlacmdlsdjrrazj9hwnkk9ldc6flgq15ba74nr"; + revision = "6"; + editedCabalFile = "1pg5v8fnlqw1krgi3d2a03a0zkjjdv5yp5f5z6q4mlb5jldz99a8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -130979,8 +131315,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "4"; - editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; + revision = "5"; + editedCabalFile = "0m67chpgxwakx62n22555nr2ii1hvspqcypjdwib9c1jrpg3ss95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -131023,6 +131359,8 @@ self: { pname = "linear-accelerate"; version = "0.6.0.0"; sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; + revision = "1"; + editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -133146,8 +133484,8 @@ self: { pname = "log-domain"; version = "0.12"; sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi"; - revision = "2"; - editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d"; + revision = "3"; + editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -133436,23 +133774,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logging-effect_1_3_0" = callPackage + "logging-effect_1_3_1" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, wl-pprint-text + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "logging-effect"; - version = "1.3.0"; - sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn"; + version = "1.3.1"; + sha256 = "0swpklfn119q08yzxn71xfb8imv5ppcvl58dr297n1sr0v2xw7sb"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base + unliftio-core ]; benchmarkHaskellDepends = [ base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text + prettyprinter text time ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; @@ -134233,8 +134572,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "2"; - editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; + revision = "3"; + editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -135105,8 +135444,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "6"; - editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7"; + revision = "7"; + editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -137555,24 +137894,24 @@ self: { "mbug" = callPackage ({ mkDerivation, base, bytestring, directory, extra, formatting - , http-client, http-client-tls, optparse-applicative, process + , http-client, http-client-tls, mtl, optparse-applicative, process , scalpel-core, tagsoup, text, time, xdg-basedir }: mkDerivation { pname = "mbug"; - version = "1.2"; - sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8"; + version = "1.3"; + sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; executableHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; @@ -139044,6 +139383,43 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "microformats2-parser_1_0_1_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , base-compat, blaze-html, blaze-markup, bytestring, containers + , data-default, either, errors, hspec + , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl + , network, network-uri, options, pcre-heavy, raw-strings-qq, safe + , scotty, tagsoup, template-haskell, text, time, transformers + , unordered-containers, vector, wai-cli, wai-extra, xml-lens + , xss-sanitize + }: + mkDerivation { + pname = "microformats2-parser"; + version = "1.0.1.8"; + sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base base-compat blaze-markup bytestring + containers data-default either errors html-conduit lens-aeson + network-uri pcre-heavy safe tagsoup text time transformers + unordered-containers vector xml-lens xss-sanitize + ]; + executableHaskellDepends = [ + aeson aeson-pretty base base-compat blaze-html blaze-markup + data-default network network-uri options scotty text wai-cli + wai-extra + ]; + testHaskellDepends = [ + aeson-qq base base-compat bytestring data-default hspec + hspec-expectations-pretty-diff html-conduit mtl network-uri + raw-strings-qq template-haskell text time xml-lens + ]; + description = "A Microformats 2 parser"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microformats2-types" = callPackage ({ mkDerivation, aeson, base, data-default-class, pandoc-types , setters, text, time @@ -139759,6 +140135,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-types_0_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.8"; + sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -145700,6 +146088,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "names-th_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "names-th"; + version = "0.3.0.0"; + sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb"; + libraryHaskellDepends = [ base containers template-haskell ]; + description = "Manipulate name strings for TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namespace" = callPackage ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { @@ -145862,6 +146262,8 @@ self: { pname = "nanovg"; version = "0.6.0.0"; sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3"; + revision = "1"; + editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -147079,14 +147481,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_2_7_0_0" = callPackage + "network_2_7_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: mkDerivation { pname = "network"; - version = "2.7.0.0"; - sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1"; + version = "2.7.0.1"; + sha256 = "1n2lixpl5w8nfn66qw86xsbh3p2v9pc6mhsxhjnwxdq2jv1qs2kh"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -147333,6 +147735,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "network-conduit-tls_1_3_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , connection, data-default-class, HUnit, mtl, network + , streaming-commons, tls, transformers, unliftio-core + }: + mkDerivation { + pname = "network-conduit-tls"; + version = "1.3.2"; + sha256 = "0zxdsf7isv3l2g58vsvi8iwlrgf85v7ksa8636kr6ffycbhn1zgc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra connection data-default-class + network streaming-commons tls transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra connection HUnit mtl + ]; + description = "Create TLS-aware network code with conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-connection" = callPackage ({ mkDerivation, base, bytestring, containers, network , network-bytestring, stm @@ -149063,8 +149486,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "non-empty-containers"; - version = "0.1.0.0"; - sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw"; + version = "0.1.1.0"; + sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc"; libraryHaskellDepends = [ base containers ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149157,12 +149580,12 @@ self: { }) {}; "nonemptymap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { pname = "nonemptymap"; - version = "0.0.2.0"; - sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v"; - libraryHaskellDepends = [ base containers ]; + version = "0.0.4.0"; + sha256 = "0rkdhbg0bps8ws20xspw98fkmbcgzfir9kk5pxwir8x6pwwbfd8h"; + libraryHaskellDepends = [ base containers semigroupoids ]; description = "A NonEmptyMap Implementation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150136,8 +150559,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "1.0.0.1"; - sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw"; + version = "1.0.0.2"; + sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155464,16 +155887,16 @@ self: { }) {}; "parsix" = callPackage - ({ mkDerivation, base, bytestring, containers, fingertree, mtl - , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, transformers + ({ mkDerivation, base, containers, fingertree, mtl, parsers + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "parsix"; - version = "0.1.0.1"; - sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1"; + version = "0.1.0.2"; + sha256 = "0dg48xycw7dl3700ws9qi49i8095nqag6wr9n1jan2w2gd0vchy1"; libraryHaskellDepends = [ - base bytestring containers fingertree mtl parsers prettyprinter + base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers ]; testHaskellDepends = [ @@ -157277,6 +157700,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_4" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.4"; + sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC @@ -157297,6 +157739,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_3" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.3"; + sha256 = "0m5cx6848s9vxmbrxwv3v9f3vplpayxjddn7j332k3kj3qbdgs4v"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -161542,6 +162005,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pomaps_0_0_1_0" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, criterion + , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty + , tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.1.0"; + sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim lattices + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest Glob lattices tasty + tasty-hspec tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; + description = "Maps and sets of partial orders"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -165830,6 +166317,8 @@ self: { pname = "protocol-buffers"; version = "2.4.10"; sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk"; + revision = "1"; + editedCabalFile = "04cv52k497nmh04pflmjrl26vlbczvm3mk4qld0zrwqxkk6v0ris"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -165838,12 +166327,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_11" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.11"; + sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; version = "2.4.10"; sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0"; + revision = "1"; + editedCabalFile = "03b3w0yawnjv5hpprkhj49s1fkj9ib03avyxgv3i9vj0n0ngbiz1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -165852,6 +166360,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_11" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.11"; + sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -170394,8 +170917,8 @@ self: { pname = "rcu"; version = "0.2.2"; sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; - revision = "2"; - editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr"; + revision = "3"; + editedCabalFile = "1qyc8jb97mfcmijn825s6mr244mx2kqvam5mm519dm6dyk8kchpa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -172572,6 +173095,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-tdfa_1_2_3_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl + , parsec, regex-base + }: + mkDerivation { + pname = "regex-tdfa"; + version = "1.2.3.1"; + sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim mtl parsec regex-base + ]; + description = "Replaces/Enhances Text.Regex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-tdfa-pipes" = callPackage ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base , regex-tdfa @@ -173139,7 +173678,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_11_3_0" = callPackage + "relational-query_0_11_4_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -173147,8 +173686,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.11.3.0"; - sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p"; + version = "0.11.4.0"; + sha256 = "0pai1x1hqk8mn7gqxjrchb7rcv5dc8q4iwiklb8w3band7jwpnf7"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -173281,6 +173820,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.6.2"; + sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -175299,8 +175854,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.4.0.0"; - sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; + version = "0.4.0.1"; + sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175316,13 +175871,13 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.0"; - sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; + version = "0.4.0.1"; + sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; executableHaskellDepends = [ base ]; - description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; + description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -177900,8 +178455,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.2"; - sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni"; + version = "1.0.3"; + sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -179567,6 +180122,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "script-monad" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client + , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "script-monad"; + version = "0.0.1"; + sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring http-client http-types lens + lens-aeson QuickCheck text time unordered-containers vector wreq + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + description = "Transformer stack of error, reader, writer, state, and prompt monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scrobble" = callPackage ({ mkDerivation, base, containers, curl, MissingH, network , network-uri, old-locale, pureMD5, time, url @@ -180557,8 +181135,8 @@ self: { pname = "semigroupoids"; version = "5.2.2"; sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "3"; - editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4"; + revision = "4"; + editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -184341,16 +184919,16 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal + , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal , shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.6"; - sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f"; + version = "1.9.0.0"; + sha256 = "0hnqcb79ncklf9zhvl70bxfqzgd19b4vs4angyi8swzmhvpxxizj"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats - microlens microlens-th shake shake-cabal shake-ext text + microlens shake shake-c shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; @@ -184361,8 +184939,8 @@ self: { ({ mkDerivation, base, cdeps, shake }: mkDerivation { pname = "shake-c"; - version = "0.1.0.0"; - sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209"; + version = "0.3.0.0"; + sha256 = "1ib1090z5vrch5nbx9dyn89yxawwhz2igb0s08sqgn7lawd03vvw"; libraryHaskellDepends = [ base cdeps shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -184423,16 +185001,12 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, cdeps, composition-prelude, directory, shake - , template-haskell - }: + ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "2.12.0.0"; - sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h"; - libraryHaskellDepends = [ - base cdeps composition-prelude directory shake template-haskell - ]; + version = "3.0.1.0"; + sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm"; + libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185657,6 +186231,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gdk_x11 = null; gtk_x11 = null;}; + "siggy-chardust" = callPackage + ({ mkDerivation, base, doctest, hlint, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "siggy-chardust"; + version = "1.0.0"; + sha256 = "0hssby6mak0bq1fqv47hp6rnw51yz1kgzgsmnvh2k9jfq0y0qwwz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hlint smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Rounding rationals to significant digits and decimal places"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "sigma-ij" = callPackage ({ mkDerivation, array, base, combinat, containers , optparse-applicative, parsec2, random, time @@ -191814,6 +192405,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_2" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.2"; + sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -193209,6 +193813,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "starter_0_3_0" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.3.0"; + sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx"; + libraryHaskellDepends = [ base fsnotify ]; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -199893,17 +200509,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_1_0_1" = callPackage + "tasty_1_1_0_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.1.0.1"; - sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw"; + version = "1.1.0.2"; + sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix + stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; @@ -200045,6 +200662,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, temporary-rc + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.2"; + sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404"; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary-rc + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -202900,6 +203538,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-postgresql_0_0_3_1" = callPackage + ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple + , transformers, transformers-compat + }: + mkDerivation { + pname = "text-postgresql"; + version = "0.0.3.1"; + sha256 = "1s42a1mq7hz63zfpcv7bl4141vnyrsyd0ir723iph6vmsa46iqn6"; + libraryHaskellDepends = [ + base dlist transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "Parser and Printer of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -205748,8 +206403,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.0"; - sha256 = "0nl2qpj59zavvdjbq565ls2gz4apwh2qq2jrknxsvwfl79jnf8pz"; + version = "1.9.1"; + sha256 = "0i44m49v9vxcasiacrrk6ypqan3j2qw4r9g2m99brmji9kwma2kb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208048,8 +208703,8 @@ self: { pname = "trifecta"; version = "1.7.1.1"; sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "4"; - editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z"; + revision = "5"; + editedCabalFile = "0zlvnmzxx1ax8kx1d0z4jibjy49picz2zxknr8i6pz1gsj89bgrw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -208651,8 +209306,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.3.0.0"; - sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15"; + version = "0.3.1.0"; + sha256 = "0hv0fcz5sw93v1niq2r656wpkiwkg6larld7x9cwk4s98h7qvqgn"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; description = "functions on n-ary tuples using generics-sop"; @@ -215212,14 +215867,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_2_0" = callPackage + "vector-sized_1_0_3_0" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.2.0"; - sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69"; + version = "1.0.3.0"; + sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx"; libraryHaskellDepends = [ adjunctions base deepseq distributive finite-typelits indexed-list-literals primitive vector @@ -215576,6 +216231,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vfr-waypoints" = callPackage + ({ mkDerivation, base, checkers, containers, fuzzy, hedgehog, lens + , monoid-subclasses, optparse-applicative, QuickCheck, tasty + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "vfr-waypoints"; + version = "0.1.0.0"; + sha256 = "0s80vnix20jcrasra5civ2apnqjrnvi2r7ry568r32fhlgag4cr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fuzzy lens monoid-subclasses + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative + ]; + testHaskellDepends = [ + base checkers hedgehog lens QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck transformers + ]; + description = "VFR waypoints, as published in the AIP (ERSA)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -219199,6 +219879,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "webdriver-w3c" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, directory, exceptions, http-client + , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec + , QuickCheck, random, scientific, script-monad, SHA, stm, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers, uri-encode, vector, wreq + }: + mkDerivation { + pname = "webdriver-w3c"; + version = "0.0.1"; + sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + directory exceptions http-client http-types JuicyPixels lens + lens-aeson network-uri QuickCheck random scientific script-monad + SHA stm tasty tasty-expected-failure text time unordered-containers + uri-encode vector wreq + ]; + executableHaskellDepends = [ base tasty tasty-expected-failure ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers directory + exceptions http-client http-types JuicyPixels lens lens-aeson + parsec QuickCheck random scientific script-monad tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text time + unordered-containers vector wreq + ]; + description = "Bindings to the WebDriver API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "webex-teams-api" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, http-conduit @@ -228494,6 +229207,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip;}; + "zip-archive_0_3_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, pretty, process + , temporary, text, time, unix, unzip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.3"; + sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit process temporary time + unix + ]; + testToolDepends = [ unzip ]; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl @@ -228596,8 +229335,8 @@ self: { pname = "zippers"; version = "0.2.5"; sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; - revision = "2"; - editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm"; + revision = "3"; + editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens profunctors semigroupoids semigroups From 48e1d7837a8b00f9eabb1aeee4ee7aa8e112d236 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Jun 2018 20:39:54 +0200 Subject: [PATCH 144/312] haskell-doctest: update override for ghc-8.4.x to latest version --- .../configuration-ghc-8.4.x.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index db453e66c679..1e48971b6fbe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -39,23 +39,7 @@ self: super: { unix = null; xhtml = null; - ## Shadowed: - - ## Needs bump to a versioned attribute - ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_15_0 (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.11.3 - doCheck = false; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## Cabal <2.2 - ## Older versions don't compile. + doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck hackage-db = super.hackage-db_2_0_1; ## Needs bump to a versioned attribute From fb9f0ebc9a6981b35c875b074c07884a8ac4cb61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Jun 2018 10:07:28 +0200 Subject: [PATCH 145/312] haskell-vector-sized: update override for the latest 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 439e033acb0d..b196b1a9ccd1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1039,7 +1039,7 @@ self: super: { vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; # Builds only with the latest version of indexed-list-literals. - vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override { + vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override { indexed-list-literals = self.indexed-list-literals_0_2_1_1; }; From 1b3111e4361fdc337390448b22b4271437e7efc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Jun 2018 10:11:33 +0200 Subject: [PATCH 146/312] all-cabal-hashes: update snapshot to Hackage at 2018-06-22T09:51:25Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a60368e5c6dc..d25a165e40c4 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/db00b74891fcaae598fdcaf3835e274be8f2c082.tar.gz"; - sha256 = "0csvwqnvyg2jg76rr4blm4hm6max10a6as4mnwdz76sliw4092sg"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/dc7b5d4f0ee056ec87a4a5069b3c68bdd316abd6.tar.gz"; + sha256 = "0llycqa2y6ng5bhzb19ya6p83k0chfycpivg9287gzsmj363j934"; } From 8603f343a326b954f7a61ec8f07322f0f8712cf6 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Thu, 31 May 2018 14:00:33 +0200 Subject: [PATCH 147/312] gildas: init at 201806_a --- .../science/astronomy/gildas/clang.patch | 22 +++++ .../science/astronomy/gildas/default.nix | 68 +++++++++++++ .../science/astronomy/gildas/openblas.patch | 96 +++++++++++++++++++ .../astronomy/gildas/return-error-code.patch | 13 +++ .../science/astronomy/gildas/wrapper.patch | 19 ++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 220 insertions(+) create mode 100644 pkgs/applications/science/astronomy/gildas/clang.patch create mode 100644 pkgs/applications/science/astronomy/gildas/default.nix create mode 100644 pkgs/applications/science/astronomy/gildas/openblas.patch create mode 100644 pkgs/applications/science/astronomy/gildas/return-error-code.patch create mode 100644 pkgs/applications/science/astronomy/gildas/wrapper.patch diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/applications/science/astronomy/gildas/clang.patch new file mode 100644 index 000000000000..4d6654a99aee --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/clang.patch @@ -0,0 +1,22 @@ +diff -ruN gildas-src-jun18a/admin/define-system.sh gildas-src-jun18a.clang/admin/define-system.sh +--- gildas-src-jun18a/admin/define-system.sh 2018-03-12 11:07:57.000000000 +0100 ++++ gildas-src-jun18a.clang/admin/define-system.sh 2018-06-12 14:56:14.000000000 +0200 +@@ -218,13 +218,13 @@ + else + GAG_MACHINE=pc + fi +- if which gcc > /dev/null 2>&1; then +- DEFAULT_CCOMPILER=gcc ++ if which clang > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=clang + fi +- if which g++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=g++ +- elif which clang++ > /dev/null 2>&1; then ++ if which clang++ > /dev/null 2>&1; then + DEFAULT_CXXCOMPILER=clang++ ++ elif which g++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=g++ + fi + if which ifort > /dev/null 2>&1; then + DEFAULT_FCOMPILER=ifort diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix new file mode 100644 index 000000000000..bd7288f2e9c8 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif +, cfitsio , getopt , perl , groff , which , openblas +}: + +let + python27Env = python27.withPackages(ps: with ps; [ numpy ]); +in + +stdenv.mkDerivation rec { + srcVersion = "jun18a"; + version = "20180601_a"; + name = "gildas-${version}"; + + src = fetchurl { + url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; + sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; + + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env openblas ]; + + patches = [ ./wrapper.patch ./return-error-code.patch ./openblas.patch ./clang.patch ]; + + configurePhase='' + substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out + substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + source admin/gildas-env.sh -c gfortran -o openmp -s ${openblas}/lib + echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl + ''; + + buildPhase='' + make depend + make install + ''; + + installPhase='' + mkdir -p $out/bin + cp -a ../gildas-exe-${srcVersion}/* $out + mv $out/$GAG_EXEC_SYSTEM $out/libexec + cp admin/wrapper.sh $out/bin/gildas-wrapper.sh + chmod 755 $out/bin/gildas-wrapper.sh + for i in $out/libexec/bin/* ; do + ln -s $out/bin/gildas-wrapper.sh $out/bin/$(basename "$i") + done + ''; + + meta = { + description = "Radioastronomy data analysis software"; + longDescription = '' + GILDAS is a collection of state-of-the-art software + oriented toward (sub-)millimeter radioastronomical + applications (either single-dish or interferometer). + It is daily used to reduce all data acquired with the + IRAM 30M telescope and Plateau de Bure Interferometer + PDBI (except VLBI observations). GILDAS is easily + extensible. GILDAS is written in Fortran-90, with a + few parts in C/C++ (mainly keyboard interaction, + plotting, widgets).''; + homepage = http://www.iram.fr/IRAMFR/GILDAS/gildas.html; + license = stdenv.lib.licenses.free; + maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ]; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/applications/science/astronomy/gildas/openblas.patch b/pkgs/applications/science/astronomy/gildas/openblas.patch new file mode 100644 index 000000000000..4236b50796cf --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/openblas.patch @@ -0,0 +1,96 @@ +diff -ruN gildas-src-may18a.orig/admin/gildas-env.sh gildas-src-may18a/admin/gildas-env.sh +--- gildas-src-may18a.orig/admin/gildas-env.sh 2018-04-24 18:20:08.000000000 +0200 ++++ gildas-src-may18a/admin/gildas-env.sh 2018-05-04 16:39:18.982253471 +0200 +@@ -430,7 +430,7 @@ + # dot (e.g. so.3 is not counted), because e.g. /usr/lib64/liblapack.so.3 + # is useless and can not be found by the linker on command lines like + # "-L/usr/lib -llapack" +- occurences=`\ls ${2}/${1}* 2> /dev/null | \grep -v "${2}/${1}.*\." | \wc -l` ++ occurences=`\ls -l ${2}/${1}{so,a,h} 2> /dev/null | \wc -l` + if [ ${occurences} -ge 1 ]; then + \return 0 + else +@@ -458,11 +458,9 @@ + SDM_MISSING= + # + for DIR in $GAGENV_SEARCH_PATH; do +- if file_present "liblapack." "${DIR}"; then ++ if file_present "libopenblas." "${DIR}"; then + LAPACK_PRESENT=yes + LAPACK_LIB_DIR=$DIR +- fi +- if file_present "libblas." "${DIR}"; then + BLAS_PRESENT=yes + BLAS_LIB_DIR=$DIR + fi +@@ -493,7 +491,7 @@ + X11_LIB=no + # + for DIR in $INC_PATH; do +- if file_present "X.h" "${DIR}/X11"; then ++ if file_present "X." "${DIR}/X11"; then + X11_INC=yes + X11_INC_DIR=$DIR + fi +diff -ruN gildas-src-may18a.orig/admin/Makefile.build gildas-src-may18a/admin/Makefile.build +--- gildas-src-may18a.orig/admin/Makefile.build 2018-03-19 17:48:07.000000000 +0100 ++++ gildas-src-may18a/admin/Makefile.build 2018-05-04 16:39:18.982253471 +0200 +@@ -398,9 +398,7 @@ + # only the shared libraries are installed (i.e. the corresponding archive + # libraries are missing). + +--lblas: +- +--llapack: ++-lopenblas: + + -lslatec: + +diff -ruN gildas-src-may18a.orig/admin/Makefile.def gildas-src-may18a/admin/Makefile.def +--- gildas-src-may18a.orig/admin/Makefile.def 2018-03-21 17:53:34.000000000 +0100 ++++ gildas-src-may18a/admin/Makefile.def 2018-05-04 16:41:59.233518207 +0200 +@@ -206,7 +206,7 @@ + ########################################################################### + # Other defaults + +-LINEAR = lapack ++LINEAR = openblas + GLOBAL_DIRTY = $(builddir) *~ TAGS ChangeLog* Makefile.bak + + ########################################################################### +@@ -515,7 +515,7 @@ + ########################################################################### + # Kernel libraries + +-LEGACY_LIBS = -lslatec -llapack -lblas ++LEGACY_LIBS = -lslatec -lopenblas + _GAG_LIBS = -lggui -lgcore -lgio -lgfits -lgwcs -lgmath -lgsys -lginc + ifndef GAG_WIN32 + GAG_LIBS = $(_GAG_LIBS) +diff -ruN gildas-src-may18a.orig/legacy/slatec/Makefile gildas-src-may18a/legacy/slatec/Makefile +--- gildas-src-may18a.orig/legacy/slatec/Makefile 2014-12-09 11:31:56.000000000 +0100 ++++ gildas-src-may18a/legacy/slatec/Makefile 2018-05-04 16:39:18.982253471 +0200 +@@ -24,7 +24,7 @@ + U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \ + r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o + +-LIB_DEPENDS = -llapack -lblas ++LIB_DEPENDS = -lopenblas + + ifeq ($(GAG_COMPILER_FKIND),ifc) + OPTION_FFLAGS = +diff -ruN gildas-src-may18a.orig/packages/clic/lib/Makefile gildas-src-may18a/packages/clic/lib/Makefile +--- gildas-src-may18a.orig/packages/clic/lib/Makefile 2018-01-16 11:53:15.000000000 +0100 ++++ gildas-src-may18a/packages/clic/lib/Makefile 2018-05-04 16:39:18.982253471 +0200 +@@ -56,9 +56,9 @@ + sg_line_table.o table_passband.o clic_index.o clic_blank.o + + # Mathematical library dependency +-ifeq ($(LINEAR),lapack) ++ifeq ($(LINEAR),openblas) + LINEAR_LIB_OBJECTS = singular.o mth_lapack.o +- LINEAR_LIB_DEPENDS = -llapack -lblas ++ LINEAR_LIB_DEPENDS = -lopenblas + else + ifeq ($(LINEAR),nag) + LINEAR_LIB_OBJECTS = mth_nag.o diff --git a/pkgs/applications/science/astronomy/gildas/return-error-code.patch b/pkgs/applications/science/astronomy/gildas/return-error-code.patch new file mode 100644 index 000000000000..f0bd7da9354e --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/return-error-code.patch @@ -0,0 +1,13 @@ +diff --new-file -r -u gildas-src-dec17a.orig/admin/gildas-env.sh gildas-src-dec17a/admin/gildas-env.sh +--- gildas-src-dec17a.orig/admin/gildas-env.sh 2017-10-24 11:39:18.000000000 +0200 ++++ gildas-src-dec17a/admin/gildas-env.sh 2017-12-01 11:17:32.051953670 +0100 +@@ -1010,6 +1010,9 @@ + gagenv_message "$gagenv_errors error(s) and $gagenv_warnings warning(s) detected" + if [ $gagenv_errors -ne 0 ]; then + gagenv_message "GILDAS will not compile" ++ gagenv_clean ++ echo ++ \return 1 + elif [ $gagenv_warnings -ne 0 ]; then + gagenv_message "GILDAS will compile with some optional features disabled" + else diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/applications/science/astronomy/gildas/wrapper.patch new file mode 100644 index 000000000000..2e470a1e9cdc --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/wrapper.patch @@ -0,0 +1,19 @@ +diff --new-file -r -u gildas-src-feb17d.orig/admin/wrapper.sh gildas-src-feb17d/admin/wrapper.sh +--- gildas-src-feb17d.orig/admin/wrapper.sh 1970-01-01 01:00:00.000000000 +0100 ++++ gildas-src-feb17d/admin/wrapper.sh 2017-05-18 21:00:01.660778782 +0200 +@@ -0,0 +1,15 @@ ++#!/bin/sh -e ++ ++export GAG_ROOT_DIR="%%OUT%%" ++export GAG_PATH="${GAG_ROOT_DIR}/etc" ++export GAG_EXEC_SYSTEM="libexec" ++export PYTHONHOME="%%PYTHONHOME%%" ++if [ -z "\$PYTHONPATH" ]; then ++ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python" ++else ++ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}" ++fi ++export PYTHONPATH ++export LD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/ ++me=`basename $0` ++exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/${me} ${*} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cae3fa291da..945ad8eff7ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20686,6 +20686,8 @@ with pkgs; fityk = callPackage ../applications/science/misc/fityk { }; + gildas = callPackage ../applications/science/astronomy/gildas { }; + gplates = callPackage ../applications/science/misc/gplates { boost = boost160; cgal = cgal.override { boost = boost160; }; From ba2f45c1829e4a2eff0012cd5f83ec7a9553d475 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Thu, 14 Jun 2018 09:31:51 +0200 Subject: [PATCH 148/312] gildas: use the standard installPhase --- pkgs/applications/science/astronomy/gildas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index bd7288f2e9c8..da575b5cdd4a 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { buildPhase='' make depend - make install + make ''; - installPhase='' + postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out mv $out/$GAG_EXEC_SYSTEM $out/libexec From 501704b13cf5d29ebaa897226f75b4e7914cbbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Jun 2018 10:20:46 +0100 Subject: [PATCH 149/312] wireguard: 0.0.20180613 -> 0.0.20180625 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index e8f8b4258721..4d4a9446b455 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180613"; + version = "0.0.20180625"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; + sha256 = "1z7iibydj59nzx0jcxabb9k7b6djjz6yi032n66mqr98dh4dlkb7"; }; sourceRoot = "source/src/tools"; From 9f220ebf76c46b4c41d947c7472b0dc6ec93d482 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Jun 2018 10:08:44 +0000 Subject: [PATCH 150/312] perlPackages.PathTools: 3.47 -> 3.74 (#42591) --- pkgs/top-level/perl-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44d50aefefcb..b77a46513a57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12064,10 +12064,13 @@ let self = _self // overrides; _self = with self; { }; PathTools = buildPerlPackage { - name = "PathTools-3.47"; + name = "PathTools-3.74"; + preConfigure = '' + substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd' + ''; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.47.tar.gz; - sha256 = "caa8d4b45372b8cb0ef0f6f696efa3a60b0fd394b115cad39a7fbb8f6bd38026"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.74.tar.gz; + sha256 = "25724cc54c59a3bfabadec95e72db292c98676bf3632497384e8dc6277936e11"; }; }; From f51c25631456c94cac59c66ef53decd056bcbf01 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Jun 2018 10:09:22 +0000 Subject: [PATCH 151/312] perlPackages.MHonArc: fix build (#42593) --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b77a46513a57..daa351c522e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9503,7 +9503,7 @@ let self = _self // overrides; _self = with self; { url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz"; sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2"; }; - propagatedBuildInputs = [ ]; + outputs = [ "out" "dev" ]; # no "devdoc" installTargets = "install"; From ea946b06119b67b5d1d60ededcf77ba8ff78e1ce Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 26 Jun 2018 10:12:14 +0000 Subject: [PATCH 152/312] perlPackages: add meta.broken = true; (#42595) mark old and unmaintained by upstream packages as broken --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index daa351c522e2..2018b5065a1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13191,6 +13191,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz"; sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp"; }; + meta.broken = true; }; RegexpGrammars = buildPerlModule rec { @@ -14088,6 +14089,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ArchiveZip_1_53 pkgs.file ]; + meta.broken = true; }; @@ -14107,6 +14109,7 @@ let self = _self // overrides; _self = with self; { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; + meta.broken = true; }; }; From 19ce96584a13482c2ae6d24cabeb3eb9c2b8b5cd Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Tue, 26 Jun 2018 12:33:18 +0200 Subject: [PATCH 153/312] git-sync: move to gitAndTools.git-sync By convention, git-related tools in nixpkgs are not added to the top level but bundled under gitAndTools. --- pkgs/applications/version-management/git-and-tools/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9a4ef524dde9..24da6a71c580 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -95,6 +95,8 @@ rec { git-stree = callPackage ./git-stree { }; + git-sync = callPackage ./git-sync { }; + git2cl = callPackage ./git2cl { }; gitFastExport = callPackage ./fast-export { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9596e940e36..e2b28d0207d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16106,8 +16106,6 @@ with pkgs; python = python27; }; - git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { }; - gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; From b2831de441dcad63784c8e358de9e3d394248853 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Tue, 26 Jun 2018 09:21:07 -0400 Subject: [PATCH 154/312] yafaray-core: init at v3.3.0 --- pkgs/tools/graphics/yafaray-core/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/graphics/yafaray-core/default.nix diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix new file mode 100644 index 000000000000..a0de144d907e --- /dev/null +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib +, libxml2, freetype, libjpeg, libtiff, swig, openexr +, ilmbase, boost165 +, withPython ? true, python35 +}: + +stdenv.mkDerivation rec { + + name = "yafaray-core-${version}"; + version = "v3.3.0"; + + src = fetchFromGitHub { + owner = "YafaRay"; + repo = "Core"; + rev = "${version}"; + sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; + }; + + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" + ''; + + buildInputs = [ + cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff + swig openexr ilmbase + ] ++ stdenv.lib.optional withPython python35; + + meta = with stdenv.lib; { + description = "A free, open source raytracer"; + homepage = http://www.yafaray.org; + maintainers = with maintainers; [ hodapp ]; + license = licenses.lgpl21; + platforms = platforms.linux; + }; + } + +# TODO: Add optional Ruby support +# TODO: Add Qt support? (CMake looks for it, but what for?) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cae3fa291da..bf9731879064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5932,6 +5932,8 @@ with pkgs; xwinwrap = callPackage ../tools/X11/xwinwrap {}; + yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; From b845a8129f98560ed43b4e79a7e840a4b0a680ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= Date: Tue, 26 Jun 2018 16:35:47 +0200 Subject: [PATCH 155/312] wine: stable 3.0.1 -> 3.0.2, unstable: 3.9 -> 3.11 --- pkgs/misc/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c55fbbb0b8a1..bba06d6f6809 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "3.0.1"; + version = "3.0.2"; url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; - sha256 = "1wr63n70pli83p3rmclr2j4lxzs4ll1cwlpdlaajfrf6v9yhvl5s"; + sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.9"; + version = "3.11"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0ddphvlp9lsjyqc6zckinc36bggpkg925v0x2vqr8nkdjs0w5bfc"; + sha256 = "0zlhkz6aybkr9jg8za9x56fp92q10df0abadn9bsa8ryparr5d15"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "022hzh9i0pc063vcdy7ilb1lxlxpzgr4llcb52y2j3gz1psrcyqs"; + sha256 = "0si6mvva4li6cix2p43dgpdg297642l0vipaam0ng4rmgpr92jrf"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 7b01e2b7d6821bb48b9bc8c622af74d735e44a63 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Tue, 26 Jun 2018 17:15:51 +0200 Subject: [PATCH 156/312] gildas: use internal LAPACK instead of OpenBLAS Gildas' uv_fit task segfaults when it uses OpenBLAS. Use internal LAPACK version instead. --- .../science/astronomy/gildas/default.nix | 8 +- .../science/astronomy/gildas/openblas.patch | 96 ------------------- 2 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 pkgs/applications/science/astronomy/gildas/openblas.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index da575b5cdd4a..bd4587bf2276 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif -, cfitsio , getopt , perl , groff , which , openblas +, cfitsio , getopt , perl , groff , which }: let @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; - buildInputs = [ gtk2-x11 lesstif cfitsio python27Env openblas ]; + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./openblas.patch ./clang.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} - source admin/gildas-env.sh -c gfortran -o openmp -s ${openblas}/lib + source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; diff --git a/pkgs/applications/science/astronomy/gildas/openblas.patch b/pkgs/applications/science/astronomy/gildas/openblas.patch deleted file mode 100644 index 4236b50796cf..000000000000 --- a/pkgs/applications/science/astronomy/gildas/openblas.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ruN gildas-src-may18a.orig/admin/gildas-env.sh gildas-src-may18a/admin/gildas-env.sh ---- gildas-src-may18a.orig/admin/gildas-env.sh 2018-04-24 18:20:08.000000000 +0200 -+++ gildas-src-may18a/admin/gildas-env.sh 2018-05-04 16:39:18.982253471 +0200 -@@ -430,7 +430,7 @@ - # dot (e.g. so.3 is not counted), because e.g. /usr/lib64/liblapack.so.3 - # is useless and can not be found by the linker on command lines like - # "-L/usr/lib -llapack" -- occurences=`\ls ${2}/${1}* 2> /dev/null | \grep -v "${2}/${1}.*\." | \wc -l` -+ occurences=`\ls -l ${2}/${1}{so,a,h} 2> /dev/null | \wc -l` - if [ ${occurences} -ge 1 ]; then - \return 0 - else -@@ -458,11 +458,9 @@ - SDM_MISSING= - # - for DIR in $GAGENV_SEARCH_PATH; do -- if file_present "liblapack." "${DIR}"; then -+ if file_present "libopenblas." "${DIR}"; then - LAPACK_PRESENT=yes - LAPACK_LIB_DIR=$DIR -- fi -- if file_present "libblas." "${DIR}"; then - BLAS_PRESENT=yes - BLAS_LIB_DIR=$DIR - fi -@@ -493,7 +491,7 @@ - X11_LIB=no - # - for DIR in $INC_PATH; do -- if file_present "X.h" "${DIR}/X11"; then -+ if file_present "X." "${DIR}/X11"; then - X11_INC=yes - X11_INC_DIR=$DIR - fi -diff -ruN gildas-src-may18a.orig/admin/Makefile.build gildas-src-may18a/admin/Makefile.build ---- gildas-src-may18a.orig/admin/Makefile.build 2018-03-19 17:48:07.000000000 +0100 -+++ gildas-src-may18a/admin/Makefile.build 2018-05-04 16:39:18.982253471 +0200 -@@ -398,9 +398,7 @@ - # only the shared libraries are installed (i.e. the corresponding archive - # libraries are missing). - ---lblas: -- ---llapack: -+-lopenblas: - - -lslatec: - -diff -ruN gildas-src-may18a.orig/admin/Makefile.def gildas-src-may18a/admin/Makefile.def ---- gildas-src-may18a.orig/admin/Makefile.def 2018-03-21 17:53:34.000000000 +0100 -+++ gildas-src-may18a/admin/Makefile.def 2018-05-04 16:41:59.233518207 +0200 -@@ -206,7 +206,7 @@ - ########################################################################### - # Other defaults - --LINEAR = lapack -+LINEAR = openblas - GLOBAL_DIRTY = $(builddir) *~ TAGS ChangeLog* Makefile.bak - - ########################################################################### -@@ -515,7 +515,7 @@ - ########################################################################### - # Kernel libraries - --LEGACY_LIBS = -lslatec -llapack -lblas -+LEGACY_LIBS = -lslatec -lopenblas - _GAG_LIBS = -lggui -lgcore -lgio -lgfits -lgwcs -lgmath -lgsys -lginc - ifndef GAG_WIN32 - GAG_LIBS = $(_GAG_LIBS) -diff -ruN gildas-src-may18a.orig/legacy/slatec/Makefile gildas-src-may18a/legacy/slatec/Makefile ---- gildas-src-may18a.orig/legacy/slatec/Makefile 2014-12-09 11:31:56.000000000 +0100 -+++ gildas-src-may18a/legacy/slatec/Makefile 2018-05-04 16:39:18.982253471 +0200 -@@ -24,7 +24,7 @@ - U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \ - r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o - --LIB_DEPENDS = -llapack -lblas -+LIB_DEPENDS = -lopenblas - - ifeq ($(GAG_COMPILER_FKIND),ifc) - OPTION_FFLAGS = -diff -ruN gildas-src-may18a.orig/packages/clic/lib/Makefile gildas-src-may18a/packages/clic/lib/Makefile ---- gildas-src-may18a.orig/packages/clic/lib/Makefile 2018-01-16 11:53:15.000000000 +0100 -+++ gildas-src-may18a/packages/clic/lib/Makefile 2018-05-04 16:39:18.982253471 +0200 -@@ -56,9 +56,9 @@ - sg_line_table.o table_passband.o clic_index.o clic_blank.o - - # Mathematical library dependency --ifeq ($(LINEAR),lapack) -+ifeq ($(LINEAR),openblas) - LINEAR_LIB_OBJECTS = singular.o mth_lapack.o -- LINEAR_LIB_DEPENDS = -llapack -lblas -+ LINEAR_LIB_DEPENDS = -lopenblas - else - ifeq ($(LINEAR),nag) - LINEAR_LIB_OBJECTS = mth_nag.o From 8d6502f8ca9bd59931de4d0f7d74c805b34f7d14 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 26 Jun 2018 17:34:34 +0200 Subject: [PATCH 157/312] phonon-backend-vlc: use qt5 by default `minitube` is currently broken transitively due to the broken `phonon-backend-qt4`: https://hydra.nixos.org/build/76523277 Although QT4 is fairly old, this package is still built with `qt4` ATM, however QT5 is available as well. After this change, QT5 will be built by default and in case anybody requires legacy QT4 it has to be enabled explicitly like this: ``` with import { }; phonon-backend-vlc.override { withQt4 = true; } ``` Now the QT5-only build can be used (which fixes `minitube`) and there are no confusions anymore with the build dependencies. Previously `phonon-backend-vlc` and `libsForQt5.phonon-backend-vlc` used `qt4` by default which was likely responsible for broken `minitube`. --- .../development/libraries/phonon/backends/vlc.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 643e36ba6cd6..0487886a8966 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc , extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null -, withQt5 ? false +, withQt4 ? false , debug ? false }: @@ -11,11 +11,12 @@ let pname = "phonon-backend-vlc"; in -assert withQt5 -> qtbase != null; -assert withQt5 -> qtx11extras != null; +assert withQt4 -> qt4 != null; +assert !withQt4 -> qtbase != null; +assert !withQt4 -> qtx11extras != null; stdenv.mkDerivation rec { - name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { homepage = https://phonon.kde.org/; @@ -30,11 +31,11 @@ stdenv.mkDerivation rec { buildInputs = [ phonon vlc ] - ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + ++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]); - nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] - ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + ++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50736caab838..d4a437ebabe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11192,7 +11192,10 @@ with pkgs; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; + # TODO(@Ma27) get rid of that as soon as QT4 can be dropped + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { + withQt4 = true; + }; inherit (callPackage ../development/libraries/physfs { }) physfs_2 From d8560227926cea4d41e4360fd54b819025810eb9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 26 Jun 2018 17:35:05 +0200 Subject: [PATCH 158/312] tomahawk: mark as broken During `8d6502f8ca9` `phonon-backend-vlc` uses QT5 by default. Rather than fixing this it has been marked as broken as it's currently unmaintained (see c76ad476b0245c474c057b451ba6fec18e7f81f1) and broken since March (https://hydra.nixos.org/build/71873808). For now I've marked it as broken as the last *stable* release is from 2015 (see https://github.com/tomahawk-player/tomahawk/releases/tag/0.8.4). --- pkgs/applications/audio/tomahawk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 4140c5da5a45..78bd43383539 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; + broken = true; # 2018-06-25 }; } From d5de4a2529ca90fb779f828d3d439b0701f1730b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 Jun 2018 10:42:06 -0500 Subject: [PATCH 159/312] glibc: remove unused 2.26 patch series --- .../libraries/glibc/2.26-115to131.diff.gz | Bin 20022 -> 0 bytes .../libraries/glibc/2.26-75.patch.gz | Bin 289084 -> 0 bytes .../libraries/glibc/2.26-75to115.diff.gz | Bin 32865 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.26-115to131.diff.gz delete mode 100644 pkgs/development/libraries/glibc/2.26-75.patch.gz delete mode 100644 pkgs/development/libraries/glibc/2.26-75to115.diff.gz diff --git a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz b/pkgs/development/libraries/glibc/2.26-115to131.diff.gz deleted file mode 100644 index 3d866c567a790b088e2446bf2d4048710a19a9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20022 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≷Ipmyu+f)j4K7 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�`4h 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�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 z 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 diff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz deleted file mode 100644 index 9bf1a4f7d39b2d42fb92dcb0d347152425d503b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32865 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 Qn=aS<|5f>8k+Dt!0Pz)}*8l(j From ecac42bd87eb6882dec84ec97ae890c61008689e Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 14 Jun 2018 23:32:30 +0200 Subject: [PATCH 160/312] pythonPackages.python-forecastio: init at 1.4.0 --- .../python-forecastio/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/python-forecastio/default.nix diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix new file mode 100644 index 000000000000..68f9ad16977b --- /dev/null +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, stdenv, fetchPypi +, requests +, nose +, responses +}: + +buildPythonPackage rec { + pname = "python-forecastio"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m6lf4a46pnwm5xg9dnmwslwzrpnj6d9agw570grciivbvb1ji0l"; + + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ requests responses ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://zeevgilovitz.com/python-forecast.io/; + description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index feb64b1cbbc8..c7033d31d044 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2615,6 +2615,8 @@ in { }; }; + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + fpdf = callPackage ../development/python-modules/fpdf { }; fpylll = callPackage ../development/python-modules/fpylll { }; From 5db01c52434e55ea95b477a204ee29cb4fb8c53a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Jun 2018 01:14:42 +0200 Subject: [PATCH 161/312] home-assistant: regenerate component-packages adds python-forecastio to weather.darksky --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7bf7d6237488..331aa2c68014 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -794,7 +794,7 @@ "sensor.cups" = ps: with ps; [ pycups ]; "sensor.currencylayer" = ps: with ps; [ ]; "sensor.daikin" = ps: with ps; [ ]; - "sensor.darksky" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ python-forecastio ]; "sensor.deconz" = ps: with ps; [ ]; "sensor.deluge" = ps: with ps; [ deluge-client ]; "sensor.demo" = ps: with ps; [ ]; @@ -1183,7 +1183,7 @@ "weather" = ps: with ps; [ ]; "weather.bom" = ps: with ps; [ ]; "weather.buienradar" = ps: with ps; [ ]; - "weather.darksky" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ python-forecastio ]; "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; "weather.ipma" = ps: with ps; [ ]; From fe9f4abec29b5b4bfe1742658f421642b35c3860 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 26 Jun 2018 13:25:06 -0400 Subject: [PATCH 162/312] libsecurity_generic: fix apple_sdk lookup apple_sdk is now multiple output. --- .../apple-source-releases/libsecurity_generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 2783e4edb437..6730e2424be4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -21,7 +21,7 @@ name: version: sha256: args: let grep -Rl MacTypes.h . | while read file; do substituteInPlace "''$file" --replace \ '' \ - '"${pkgs.darwin.apple_sdk.sdk.out}/include/MacTypes.h"' + '"${stdenv.lib.getDev pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"' done || true # grep returns 1 if it can't find the string ''; preBuild = '' From d85aae23238cc1127fdb56eeaec6aebb7539b09a Mon Sep 17 00:00:00 2001 From: symphorien Date: Tue, 26 Jun 2018 18:06:16 +0000 Subject: [PATCH 163/312] agedu: init at 20180522.5b12791 (#42538) --- pkgs/tools/misc/agedu/default.nix | 35 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/agedu/default.nix diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix new file mode 100644 index 000000000000..2f9615a1fdbb --- /dev/null +++ b/pkgs/tools/misc/agedu/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchgit, autoreconfHook, halibut}: +let + date = "20180522"; + rev = "5b12791"; +in +stdenv.mkDerivation { + name = "agedu-${date}.${rev}"; + # upstream provides tarballs but it seems they disappear after the next version is released + src = fetchgit { + url = https://git.tartarus.org/simon/agedu.git; + inherit rev; + sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q"; + }; + + nativeBuildInputs = [autoreconfHook halibut]; + + meta = with stdenv.lib; { + description = "A Unix utility for tracking down wasted disk space"; + longDescription = '' + Most Unix file systems, in their default mode, helpfully record when a + file was last accessed. So if you generated a large amount of data years + ago, forgot to clean it up, and have never used it since, then it ought + in principle to be possible to use those last-access time stamps to tell + the difference between that and a large amount of data you're still + using regularly. + + agedu uses this information to tell you which files waste disk space when + you haven't used them since a long time. + ''; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fa455d56d7..8b4997706b20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14958,6 +14958,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + agedu = callPackage ../tools/misc/agedu { }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { useUnrar = config.ahoviewer.useUnrar or false; }; From 9e02afcd80043f57e193bdc0f31a7745ffd2164f Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Tue, 26 Jun 2018 20:22:15 +0200 Subject: [PATCH 164/312] atom-beta: fix build (#42622) --- pkgs/applications/editors/atom/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index c37064ee6000..6efa831d2588 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: let - common = pname: {version, sha256}: stdenv.mkDerivation rec { + common = pname: {version, sha256, beta}: stdenv.mkDerivation rec { name = "${pname}-${version}"; inherit version; @@ -36,7 +36,7 @@ let --set-rpath "${atomEnv.libPath}" \ $share/resources/app/apm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $out/share/atom${lib.optionalString beta "-beta"}/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux dugite=$share/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git @@ -62,10 +62,12 @@ in stdenv.lib.mapAttrs common { atom = { version = "1.28.0"; sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; + beta = false; }; atom-beta = { version = "1.29.0-beta0"; sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; + beta = true; }; } From 6f732f65602889ab2680cb09ad2bd4a6cfc620c1 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 26 Jun 2018 20:54:42 +0200 Subject: [PATCH 165/312] Revert "atom-beta: fix build (#42622)" This reverts commit 9e02afcd80043f57e193bdc0f31a7745ffd2164f. --- pkgs/applications/editors/atom/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 6efa831d2588..c37064ee6000 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: let - common = pname: {version, sha256, beta}: stdenv.mkDerivation rec { + common = pname: {version, sha256}: stdenv.mkDerivation rec { name = "${pname}-${version}"; inherit version; @@ -36,7 +36,7 @@ let --set-rpath "${atomEnv.libPath}" \ $share/resources/app/apm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom${lib.optionalString beta "-beta"}/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux dugite=$share/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git @@ -62,12 +62,10 @@ in stdenv.lib.mapAttrs common { atom = { version = "1.28.0"; sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; - beta = false; }; atom-beta = { version = "1.29.0-beta0"; sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; - beta = true; }; } From 9b69d5efd117d5bc14ecb661235dfde1315d9dc0 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 26 Jun 2018 20:56:57 +0200 Subject: [PATCH 166/312] atom, atom-beta: nicer fix for #42618 Supersedes #42622 --- pkgs/applications/editors/atom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index c37064ee6000..a77792254725 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -36,7 +36,7 @@ let --set-rpath "${atomEnv.libPath}" \ $share/resources/app/apm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux dugite=$share/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git From 3c5e7e2ae4fbc4270e410adf134ef726895ce9c1 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Tue, 26 Jun 2018 09:48:07 -0700 Subject: [PATCH 167/312] jd-gui: 0.3.5 -> 1.4.0 --- pkgs/tools/security/jd-gui/default.nix | 122 +++++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 72cb19aa732b..d9617e3eb2ba 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,52 +1,102 @@ -{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, glib, pango, fontconfig, zlib, xorg, upx, patchelf }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }: let - dynlibPath = stdenv.lib.makeLibraryPath - ([ gtk2 atk gdk_pixbuf glib pango fontconfig zlib stdenv.cc.cc.lib ] - ++ (with xorg; [ - libX11 - libXext - libXrender - libXrandr - libSM - libXfixes - libXdamage - libXcursor - libXinerama - libXi - libXcomposite - libXxf86vm - ])); -in -stdenv.mkDerivation rec { - name = "jd-gui-${version}"; - version = "0.3.5"; + version = "1.4.0"; + name = "jd-gui-${version}"; src = fetchurl { - url = "http://jd.benow.ca/jd-gui/downloads/${name}.linux.i686.tar.gz"; - sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv"; + url = "https://github.com/java-decompiler/jd-gui/archive/v${version}.tar.gz"; + sha256 = "0anz7szlr5kgmsmkyv34jdynsnk8v6kvibcyz98jsd96fh725lax"; }; - nativeBuildInputs = [ upx patchelf ]; + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src; + nativeBuildInputs = [ gradle_2_5 perl ]; - unpackPhase = "tar xf ${src}"; - installPhase = '' - mkdir -p $out/bin - upx -d jd-gui -o $out/bin/jd-gui + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d); + gradle --no-daemon build + ''; - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath ${dynlibPath} \ - $out/bin/jd-gui + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1apmqiphnav79m4rdii58h7f4qslpfig4qybyyl2fr7zk92gv3l9"; + }; + + # Point to our local deps repo + gradleInit = writeText "init.gradle" '' + logger.lifecycle 'Replacing Maven repositories with ${deps}...' + + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '${deps}' } + } + } + repositories { + clear() + maven { url '${deps}' } + } + } + } + ''; + + desktopItem = launcher: makeDesktopItem { + name = "jd-gui"; + exec = "${launcher} %F"; + icon = "jd-gui"; + comment = "Java Decompiler JD-GUI"; + desktopName = "JD-GUI"; + genericName = "Java Decompiler"; + mimeType = "application/x-java-archive;application/x-java"; + categories = "Development;Debugger;"; + }; + +in stdenv.mkDerivation rec { + inherit name version src; + + nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --offline --no-daemon --info --init-script ${gradleInit} jar + ''; + + installPhase = let + jar = "$out/share/jd-gui/${name}.jar"; + in '' + mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps} + cp build/libs/${name}.jar ${jar} + cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png + + cat > $out/bin/jd-gui < Date: Tue, 26 Jun 2018 21:29:18 +0200 Subject: [PATCH 168/312] dwm-status: 0.5.1 -> 1.0.0 (#42624) --- pkgs/applications/window-managers/dwm/dwm-status.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 6e0adb15ffdb..d76412df0624 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg, alsaUtils }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg +, enableAlsaUtils ? true, alsaUtils }: rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "0.5.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1mppj57h5yr0azypf5d2cgz2wv3k52mg3k4npyfhbmfy1393qbjs"; + sha256 = "0r0irzm5y9xvqxrr8gvvn4x9c56qwgynljnzba4mh5s5dpbmz0iq"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0qr999hwrqn7a4n4kvbrpli7shxp9jchj8csxzsw951qmzq32qwv"; + cargoSha256 = "13ibcbk8shfajk200d8v2p6y3zfrz5dlvxqfw1zsm630s5dmy6qx"; - # needed because alsaUtils is an optional runtime dependency - postInstall = lib.optionalString (alsaUtils != null) '' + postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ --prefix "PATH" : "${alsaUtils}/bin" ''; From aeb401d9c6abdfa5a15708f3d4cf366dcaa4b577 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 26 Jun 2018 15:56:47 -0400 Subject: [PATCH 169/312] albert: 0.14.15 -> 0.14.21 (#42626) Albert has a new release including several extensions and bug fixes. Additionally, this upgrade solves current QT build issues. See https://albertlauncher.github.io/news/ for the full changelog. --- pkgs/applications/misc/albert/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 250590d0d302..f16144f3befa 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,15 +1,18 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: +let + pname = "albert"; + version = "0.14.21"; +in mkDerivation rec { - name = "albert-${version}"; - version = "0.14.15"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507"; + sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w"; fetchSubmodules = true; }; From ebc7d2019094e75a82f9577035522d14f745074a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 26 Jun 2018 22:14:17 +0200 Subject: [PATCH 170/312] idrisPackages.bi: 2018-01-17 -> 2018-06-25 (#42621) --- pkgs/development/idris-modules/bi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index fb43fbf209bb..47a81a066769 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -8,15 +8,15 @@ }: build-idris-package { name = "bi"; - version = "2018-01-17"; + version = "2018-06-25"; idrisDeps = [ prelude contrib pruviloj ]; src = fetchFromGitHub { owner = "sbp"; repo = "idris-bi"; - rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a"; - sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97"; + rev = "6bd90fb30b06ab02438efb5059e2fc699fdc7787"; + sha256 = "1px550spigl8k1m1r64mjrw7qjvipa43xy95kz1pb5ibmy84d6r3"; }; meta = { From 06db050abd9985cbac0f2a96ffa91a5789482af7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 04:55:25 +0000 Subject: [PATCH 171/312] ocamlPackages.ocp-indent: remove spurious dependency to opam and fix installPhase --- pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 4 ++-- .../development/tools/ocaml/ocp-indent/default.nix | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index bdc75766bbf7..3951be18de3a 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; - nativeBuildInputs = [ ocpBuild opam ]; + nativeBuildInputs = [ ocpBuild ]; buildInputs = [ ocaml findlib cmdliner ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index d11278f4d29c..f30c0f278f78 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -8,7 +8,7 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation rec { - name = "ocp-indent-${version}"; + name = "ocaml${ocaml.version}-ocp-indent-${version}"; version = "1.6.1"; src = fetchzip { @@ -16,16 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild opam ]; + nativeBuildInputs = [ ocpBuild ]; buildInputs = [ ocaml findlib cmdliner ]; - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = http://typerex.ocamlpro.com/ocp-indent.html; From fd018bdaddf87c3bcccdf84f9698447695aed35d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:19:44 +0000 Subject: [PATCH 172/312] ocamlPackages.ocp-build: remove spurious dependency to camlp4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change attribute name from “ocpBuild” to “ocp-build”. --- pkgs/development/tools/ocaml/ocaml-top/default.nix | 2 +- pkgs/development/tools/ocaml/ocp-build/default.nix | 9 ++++----- pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 6 +++--- pkgs/development/tools/ocaml/ocp-indent/default.nix | 6 +++--- pkgs/development/tools/ocaml/ocp-index/default.nix | 6 +++--- pkgs/top-level/ocaml-packages.nix | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3cf70d66ddbd..e7d8b163420c 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ ncurses jbuilder ] - ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); + ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 8da0f781a8b2..0ed7312660a1 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in -buildOcaml { +stdenv.mkDerivation rec { - name = "ocp-build"; - inherit version; + name = "ocaml${ocaml.version}-ocp-build-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -14,7 +13,7 @@ buildOcaml { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index 3951be18de3a..693ad70402f6 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; assert versionAtLeast "0.9.8" (getVersion cmdliner); stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f30c0f278f78..43898d250d91 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion cmdliner) "1.0.0"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; inherit (jbuilder) installPhase; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 6b865e9709a6..669d9789427f 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, 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.13-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.13-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; }) ]; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] + buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; propagatedBuildInputs = [ ocpIndent ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6ca593f349fb..3f334d1ed17d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -494,7 +494,7 @@ let ocf = callPackage ../development/ocaml-modules/ocf { }; - ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; From 0d1b5285c91f93641f485da339de3382463c347c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:24:10 +0000 Subject: [PATCH 173/312] ocamlPackages.ocp-index: 1.1.5 -> 1.1.6 --- .../tools/ocaml/ocp-index/default.nix | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 669d9789427f..8f6062adb066 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,39 +1,23 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocpIndent, cmdliner, re }: -let inherit (stdenv.lib) getVersion versionAtLeast optional; in +stdenv.mkDerivation rec { -assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocp-build) "1.99.13-beta"; -assert versionAtLeast (getVersion ocpIndent) "1.4.2"; - -let - version = "1.1.5"; -in - -stdenv.mkDerivation { - - name = "ocp-index-${version}"; + version = "1.1.6"; + name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; + sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3"; }; - patches = [ (fetchpatch { - url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; - sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; - }) ]; - - buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ] - ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; + buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; propagatedBuildInputs = [ ocpIndent ]; - createFindlibDestdir = true; + buildPhase = "jbuilder build -p ocp-index"; - preBuild = "export TERM=xterm"; - postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}"; + inherit (jbuilder) installPhase; meta = { homepage = http://typerex.ocamlpro.com/ocp-index.html; From db8f874da87993cc23584472433b3c98a34d7cc1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:28:05 +0000 Subject: [PATCH 174/312] ocamlPackages.ocp-indent: fix attribute name (from ocpIndent) --- pkgs/development/tools/ocaml/ocp-index/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 8f6062adb066..0a63ae805342 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocpIndent, cmdliner, re }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; - propagatedBuildInputs = [ ocpIndent ]; + propagatedBuildInputs = [ ocp-indent ]; buildPhase = "jbuilder build -p ocp-index"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3f334d1ed17d..b6817c84d810 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -496,10 +496,10 @@ let ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; - ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; + ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; + ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocp-indent = ocp-indent_1_5_2; }; ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; From 06158033f24d7467f2361efb11f8c8bc24b87f7d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:58:53 +0000 Subject: [PATCH 175/312] ocamlPackages.ocp-index: use up-to-date ocp-indent --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b6817c84d810..c04b7e8e2f32 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -499,7 +499,7 @@ let ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocp-indent = ocp-indent_1_5_2; }; + ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; From ed1bbae4db882ed42e349dd7a8a84de535493108 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 06:23:36 +0000 Subject: [PATCH 176/312] ocamlPackages.ocp-indent: remove at 1.5.2 --- .../tools/ocaml/ocp-indent/1.5.2.nix | 37 ------------------- pkgs/top-level/ocaml-packages.nix | 1 - 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix deleted file mode 100644 index 693ad70402f6..000000000000 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocp-build, cmdliner }: - -let inherit (stdenv.lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; -assert versionAtLeast "0.9.8" (getVersion cmdliner); - -stdenv.mkDerivation { - - name = "ocp-indent-1.5.2"; - - src = fetchzip { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; - sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; - }; - - nativeBuildInputs = [ ocp-build ]; - - buildInputs = [ ocaml findlib cmdliner ]; - - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; - - meta = with stdenv.lib; { - homepage = http://typerex.ocamlpro.com/ocp-indent.html; - description = "A customizable tool to indent OCaml code"; - license = licenses.gpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c04b7e8e2f32..88aa7df63727 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -497,7 +497,6 @@ let ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; - ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; From c647ca8180326f6c8687a6b1d7fde6bda8657184 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 06:24:37 +0000 Subject: [PATCH 177/312] ocamlPackages.cmdliner: remove at 0.9.8 --- .../ocaml-modules/cmdliner/0.9.nix | 34 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/cmdliner/0.9.nix diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix deleted file mode 100644 index 345d56d21707..000000000000 --- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: - -let - pname = "cmdliner"; -in - -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -stdenv.mkDerivation rec { - - name = "ocaml-${pname}-${version}"; - version = "0.9.8"; - - src = fetchurl { - url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; - }; - - unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opaline ]; - buildInputs = [ ocaml findlib ]; - - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; - - meta = with stdenv.lib; { - homepage = http://erratique.ch/software/cmdliner; - description = "An OCaml module for the declarative definition of command line interfaces"; - license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 88aa7df63727..87e1cf907f52 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -139,8 +139,6 @@ let cil = callPackage ../development/ocaml-modules/cil { }; - cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { }; - cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { From 44b790fc6ffec74cfede6c25390434d9bc74847e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 26 Jun 2018 22:36:14 +0200 Subject: [PATCH 178/312] home-assistant: 0.72.0 -> 0.72.1 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 331aa2c68014..d0fdf7655e3c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.72.0"; + version = "0.72.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d1315611157a..eaab9a59dbf6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -6,7 +6,15 @@ let py = python3.override { + # Override the version of some packages pinned in Home Assistant's setup.py packageOverrides = self: super: { + aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "3.3.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + }; + }); requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.18.4"; src = oldAttrs.src.override { @@ -14,6 +22,7 @@ let sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; }); + # Required by requests==2.18.4 urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { version = "1.22"; src = oldAttrs.src.override { @@ -21,6 +30,7 @@ let sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; }; }); + # Required by requests==2.18.4 idna = super.idna.overridePythonAttrs (oldAttrs: rec { version = "2.6"; src = oldAttrs.src.override { @@ -74,7 +84,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.72.0"; + hassVersion = "0.72.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +99,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1jz16ikxdh8bkscjs5pczvjqbfllz8avs11gkw8a97c2lds8la76"; + sha256 = "05r55hdai0qwgpj2f2qqngks7qmz4lqcfbh2c1symfyigv7m634r"; }; propagatedBuildInputs = [ @@ -108,7 +118,7 @@ in with py.pkgs; buildPythonApplication rec { py.test --ignore tests/components # Some basic components should be tested however py.test \ - tests/components/{group,http} \ + tests/components/{group,http,frontend} \ tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; From c5cb7e550ef0bf0438240f6998afffc64b3c3fa7 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 26 Jun 2018 13:47:34 -0700 Subject: [PATCH 179/312] pasystray: add libappindicator-gtk3 for appindicator support (#42184) --- pkgs/tools/audio/pasystray/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 02235f727c5c..8fe6feaee0a6 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: +{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig +, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio +, xlibsWrapper +}: stdenv.mkDerivation rec { name = "pasystray-${version}"; @@ -13,9 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake makeWrapper - gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; + buildInputs = [ + autoconf automake makeWrapper + gnome3.defaultIconTheme + avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper + ]; preConfigure = '' aclocal From e01db49bfa43b0016229150fa19c9967677a808c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 26 Jun 2018 16:34:03 -0400 Subject: [PATCH 180/312] ghcjs-ng: Move to $out/lib/ghcjs-8.4 This is standard for ghc compilers & much more convenient. This seems to fix the issues we have been having in ghcjs pkgs. Fixes #42032 Fixes #42617 --- pkgs/development/compilers/ghcjs-ng/default.nix | 8 ++++---- .../development/haskell-modules/with-packages-wrapper.nix | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 65b43f712ae2..9aa3efe614eb 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -80,12 +80,12 @@ in stdenv.mkDerivation { cd lib/boot mkdir -p $out/bin - mkdir -p $out/libexec + mkdir -p $out/lib/${bootGhcjs.name} lndir ${libexec} $out/bin - wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec" - wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" - wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" + wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" + wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" + wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d" env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin ''; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7fda1d84e55b..1a29732b651a 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -38,7 +38,8 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else if isGhcjs then "$out/libexec" else "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" + else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); @@ -104,7 +105,7 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - '' + (lib.optionalString targetPlatform.isDarwin '' + '' + (lib.optionalString (targetPlatform.isDarwin && !isGhcjs && !targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" From 2166d37c0fda30af707377c6312a603ae71e82a3 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Tue, 26 Jun 2018 16:47:22 -0500 Subject: [PATCH 181/312] uhd: 3.11.0.0 -> 3.12.0.0 * fixes build on Darwin. * fetch images from GH releases page (uniform versioning scheme) --- pkgs/development/tools/misc/uhd/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 011d0b3e80b9..0730ef1fb09c 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,17 +9,15 @@ let uhdVer = "v" + version; - ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.11.0.0"; + version = "3.12.0.0"; - # Firmware images are downloaded (pre-built) from: - # http://files.ettus.com/binaries/images/ + # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/images/${ImgVer}"; - sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; + url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; + sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p"; }; in stdenv.mkDerivation { @@ -29,7 +27,7 @@ in stdenv.mkDerivation { owner = "EttusResearch"; repo = "uhd"; rev = "${uhdVer}"; - sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; + sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv"; }; enableParallelBuilding = true; @@ -49,8 +47,10 @@ in stdenv.mkDerivation { postPhases = [ "installFirmware" ]; + # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out" + mkdir -p "$out/share/uhd/images" + tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" ''; meta = with stdenv.lib; { From 312d2897cd99483d3162f937eca50aa5b079648e Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 3 Jun 2018 21:30:27 -0500 Subject: [PATCH 182/312] libbladerf: disable `fortify` hardening --- pkgs/development/libraries/libbladeRF/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 5ccfb0d1b26f..1597765aaa9c 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -30,8 +30,10 @@ stdenv.mkDerivation rec { "-DBUILD_DOCUMENTATION=ON" ]; + hardeningDisable = [ "fortify" ]; + meta = with stdenv.lib; { - homepage = https://www.nuand.com/; + homepage = https://nuand.com/libbladeRF-doc; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; From 0f6682c97fab3b098fb4351375c60a29c4f083f2 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 3 Jun 2018 21:44:25 -0500 Subject: [PATCH 183/312] libbladerf: enable Darwin building --- pkgs/development/libraries/libbladeRF/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 1597765aaa9c..04bd3f3d71ed 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ]; + # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 + buildInputs = [ cmake git doxygen help2man tecla libusb1 ] + ++ lib.optionals stdenv.isLinux [ udev ] + ++ lib.optionals stdenv.isDarwin [ ncurses ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -24,19 +27,19 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Debug" + "-DBUILD_DOCUMENTATION=ON" + ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" - "-DBUILD_DOCUMENTATION=ON" ]; hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://nuand.com/libbladeRF-doc; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } From 691596086f8c082f25cc6e3cbd793db1578b12a0 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 3 Jun 2018 16:12:34 -0500 Subject: [PATCH 184/312] rtl-sdr: fix linking errors on Darwin --- pkgs/applications/misc/rtl-sdr/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index 92e96a7fb5ee..bedfc563b1c0 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: +{ stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { name = "rtl-sdr-${version}"; @@ -26,7 +26,13 @@ stdenv.mkDerivation rec { grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } echo "Requires: libusb-1.0" >> "$pcfile" ''; - + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "linker-fix.patch"; + url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch"; + sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl"; + }) + ]; meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; From b64932fabecfea6590a0ddc9821b3f2fd9c8654c Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 3 Jun 2018 14:48:25 -0500 Subject: [PATCH 185/312] gnuradio: 3.7.11.1 -> 3.7.13.3 * also add mako input (cheetah will be removed in GR3.8) --- pkgs/applications/misc/gnuradio/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 58d8e9fae618..f3d501d40a77 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -6,7 +6,7 @@ # May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib # => grc - the gnu radio companion -, cheetah, pygtk +, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 # => gr-wavelet: collection of wavelet blocks , gsl # => gr-qtgui: the Qt-based GUI @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.11.1"; + version = "3.7.13.3"; src = fetchFromGitHub { owner = "gnuradio"; repo = "gnuradio"; - rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; - sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; + rev = "v${version}"; + sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj"; fetchSubmodules = true; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; propagatedBuildInputs = [ - cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; enableParallelBuilding = true; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { setupHook = [ grcSetupHook ]; # patch wxgui and pygtk check due to python importerror in a headless environment + # wxgtk gui will be removed in GR3.8 + # c++11 hack may not be necessary anymore preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4997706b20..1b7a016c9bcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15928,7 +15928,7 @@ with pkgs; gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; + inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (darwin.apple_sdk.frameworks) CoreAudio; fftw = fftwFloat; qwt = qwt6_qt4; From 695c1fcd7603b9083826a564acc6119056bddd23 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 3 Jun 2018 15:33:36 -0500 Subject: [PATCH 186/312] gnuradio: use ninja --- 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 f3d501d40a77..2710850759b9 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, writeText, makeWrapper # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # => core dependencies -, cmake, pkgconfig, git, boost, cppunit, fftw +, ninja, cmake, pkgconfig, git, boost, cppunit, fftw # => python wrappers # May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig git makeWrapper cppunit orc + cmake pkgconfig git makeWrapper cppunit orc ninja ]; buildInputs = [ From 81769a461a6e900aefb7e70cd0c79190c9614d25 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Jun 2018 20:49:57 -0400 Subject: [PATCH 187/312] linux: 4.9.109 -> 4.9.110 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 242083219b23..287d8c9cf37d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.109"; + version = "4.9.110"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c2rwddr8v1l0b5yswfmpy0pf4gdqi4ycs9b94cj2hsklma5dk9x"; + sha256 = "0ypaqj9vs2jc4qiss5yyplx09rk55fa3hrlzdkm0x7x7f0x196ip"; }; } // (args.argsOverride or {})) From 60a541bfa977c6fa372e4a56b96b028cce222ee9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Jun 2018 20:50:13 -0400 Subject: [PATCH 188/312] linux: 4.14.51 -> 4.14.52 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4f0308d14922..cf6b254ee858 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.51"; + version = "4.14.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0awpvyigj28j8ibjm5362xnlcaiqcn7lwd9wkf7k8i14m8ml1cns"; + sha256 = "0448z0sdwazk2xrwq1zrinv881qhl33f5r2n3pqb07pxnb3jdlm5"; }; } // (args.argsOverride or {})) From a25eb5da24fe001a1ed19b328128a43c109164a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Jun 2018 20:50:24 -0400 Subject: [PATCH 189/312] linux: 4.16.17 -> 4.16.18 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 61eb394f6ee0..46d58c5a14dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.17"; + version = "4.16.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1302pjxrwpdvmnpisgsgv41brj52y3ppkwi0cyd4c1q8mc5qsgf9"; + sha256 = "089hx2hdd5r558mv8n0c7jciv2nj9v77df0lsplsbxx47dqns0j1"; }; } // (args.argsOverride or {})) From 7dc31f5033f26afe34346ebb09c95494edb60f82 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Jun 2018 20:50:34 -0400 Subject: [PATCH 190/312] linux: 4.17.2 -> 4.17.3 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 7dbe8c1a15a3..166a8572cf7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.2"; + version = "4.17.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "173vv0fwykpxhldrr7z83d1wl3ly5mc21nd68f2ycjfw9mpwvssc"; + sha256 = "1z8zja786x5dxwm69zgfkwsvfwjfznwbclf76301c2fd4wjancmg"; }; } // (args.argsOverride or {})) From 978397d358ba94791bef736f19d3171a13bc03dc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 26 Jun 2018 20:50:49 -0400 Subject: [PATCH 191/312] nano: 2.9.7 -> 2.9.8 --- 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 c29cbe52872e..fb0ce43a60e6 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn"; + sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 57183eef638c6a12621f57a4ad21c92a279343e0 Mon Sep 17 00:00:00 2001 From: Paul Myjavec Date: Tue, 26 Jun 2018 16:29:49 +0900 Subject: [PATCH 192/312] saml2aws: init at 2.6.1 Adds a new package, saml2aws, a CLI tool for managaing AWS logins via SAML. For more information see https://github.com/Versent/saml2aws. * Add nix expression to build the package. * Add myself as a maintainer. --- maintainers/maintainer-list.nix | 5 + pkgs/tools/security/saml2aws/default.nix | 28 +++ pkgs/tools/security/saml2aws/deps.nix | 291 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 326 insertions(+) create mode 100644 pkgs/tools/security/saml2aws/default.nix create mode 100644 pkgs/tools/security/saml2aws/deps.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d99ce88d61ef..70e6bd5995e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3092,6 +3092,11 @@ github = "pmiddend"; name = "Philipp Middendorf"; }; + pmyjavec = { + email = "pauly@myjavec.com"; + github = "pmyjavec"; + name = "Pauly Myjavec"; + }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix new file mode 100644 index 000000000000..bf5f9116f08c --- /dev/null +++ b/pkgs/tools/security/saml2aws/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "saml2aws-${version}"; + version = "2.6.1"; + + goPackagePath = "github.com/versent/saml2aws"; + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags=-X main.Version=${version} + ''; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Versent"; + repo = "saml2aws"; + sha256 = "0sg5qm1gyrisna247lmxfgpa22y6rnz9vd6yg92kxlcwr4ji8l1j"; + }; + + meta = with stdenv.lib; { + description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; + homepage = https://github.com/Versent/saml2aws; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.pmyjavec ]; + }; +} diff --git a/pkgs/tools/security/saml2aws/deps.nix b/pkgs/tools/security/saml2aws/deps.nix new file mode 100644 index 000000000000..6069f0b184ad --- /dev/null +++ b/pkgs/tools/security/saml2aws/deps.nix @@ -0,0 +1,291 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/AlecAivazis/survey"; + fetch = { + type = "git"; + url = "https://github.com/AlecAivazis/survey"; + rev = "e752db451e07e09c7d7dc8cada807a44bdb0fd47"; + sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq"; + }; + } + { + goPackagePath = "github.com/Azure/go-ntlmssp"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ntlmssp"; + rev = "4b934ac9dad38d389d34f0b98d98b2467c422012"; + sha256 = "0pwrax8mih2jgsdifag0346vh0vivgyz45jc4kjy6dhp3qhsy34z"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + }; + } + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "901648c87902174f774fac311d7f176f8647bdaa"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"; + sha256 = "0vfpygjhdikmsqn9dgmp965ji5q790gcz9mg49mcpipc9n2lzx0d"; + }; + } + { + goPackagePath = "github.com/beevik/etree"; + fetch = { + type = "git"; + url = "https://github.com/beevik/etree"; + rev = "9d7e8feddccb4ed1b8afb54e368bd323d2ff652c"; + sha256 = "0f3lj7azxd5qq29hqd32211ds7n56i3rgmfll6c1f4css1f3srxg"; + }; + } + { + goPackagePath = "github.com/briandowns/spinner"; + fetch = { + type = "git"; + url = "https://github.com/briandowns/spinner"; + rev = "48dbb65d7bd5c74ab50d53d04c949f20e3d14944"; + sha256 = "1178kn72agihs13ffgm2sz5ad61pqwdmkrh8rhggzbaagch9mc75"; + }; + } + { + goPackagePath = "github.com/danieljoos/wincred"; + fetch = { + type = "git"; + url = "https://github.com/danieljoos/wincred"; + rev = "412b574fb496839b312a75fba146bd32a89001cf"; + sha256 = "1bb1928nnikx5036aw4152p55g8xgwx42rv0n2i5zydh1031f50m"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; + sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mgutz/ansi"; + fetch = { + type = "git"; + url = "https://github.com/mgutz/ansi"; + rev = "9520e82c474b0a04dd04f8a40959027271bab992"; + sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; + sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/tidwall/gjson"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/gjson"; + rev = "afaeb9562041a8018c74e006551143666aed08bf"; + sha256 = "1hysk947mrlpaqjq7mab0nnm190fwvfdifaa2cq3sbwfrzx6h1c8"; + }; + } + { + goPackagePath = "github.com/tidwall/match"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/match"; + rev = "1731857f09b1f38450e2c12409748407822dc6be"; + sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a8fb68e7206f8c78be19b432c58eb52a6aa34462"; + sha256 = "1svphap40hy5srcqnb0l207r6wfm9hf0f3fcaq124qp4m91s6vlf"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; + sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8014b7b116a67fea23fbb82cd834c9ad656ea44b"; + sha256 = "1ld5nr0zqjgkny7d5biix9hbnxnlzxxa5nspnal2q2c7wnai8apa"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/AlecAivazis/survey.v1"; + fetch = { + type = "git"; + url = "https://github.com/AlecAivazis/survey"; + rev = "e752db451e07e09c7d7dc8cada807a44bdb0fd47"; + sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; + sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cae3fa291da..2478cfd40f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4909,6 +4909,8 @@ with pkgs; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; + saml2aws = callPackage ../tools/security/saml2aws {}; + samplicator = callPackage ../tools/networking/samplicator { }; sasview = callPackage ../applications/science/misc/sasview {}; From 36e15996c4bb48939a9fad15b59b8f25e643a402 Mon Sep 17 00:00:00 2001 From: tim put Date: Tue, 26 Jun 2018 19:01:46 -0600 Subject: [PATCH 193/312] darktable: add opencl support --- pkgs/applications/graphics/darktable/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index ee35afb09237..ac44a1e875c0 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,6 +3,7 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, ocl-icd }: stdenv.mkDerivation rec { @@ -21,9 +22,9 @@ stdenv.mkDerivation rec { libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme - osm-gps-map + osm-gps-map ocl-icd ]; - + cmakeFlags = [ "-DBUILD_USERMANUAL=False" ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # the wrappers: preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable" + --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib" ) ''; From df313f6af8e0794986ac74f18df2ba15936c969c Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Tue, 26 Jun 2018 21:37:07 -0400 Subject: [PATCH 194/312] nexus: 3.11.0 -> 3.12.1 --- .../development/tools/repository-managers/nexus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index fb7a60070744..39e37b217cf3 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nexus-${version}"; - version = "3.11.0-01"; + version = "3.12.1-01"; src = fetchurl { - url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz"; - sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim"; + url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; + sha256 = "1vv50zv3cr42rq1g16gdl2d1hrxna2jjynlr7kivzlbyfq89ic3f"; }; sourceRoot = name; From f194659ddbac889755737e7e2dc09b0bb821396a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 26 Jun 2018 21:47:24 -0400 Subject: [PATCH 195/312] trivial-builders: disallow sub in requireFile The requireFile call was being substituted from the binary cache. We do not want this to happen as the user needs to download the file themselves. --- pkgs/build-support/trivial-builders.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index bce5436353c3..f9816b2d0d7c 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -181,6 +181,7 @@ rec { outputHashAlgo = hashAlgo; outputHash = hash; preferLocalBuild = true; + allowSubstitutes = false; builder = writeScript "restrict-message" '' source ${stdenvNoCC}/setup cat <<_EOF_ From 4e1a82c9609fd59afea18f4c0a84819b10b0d13d Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:13:06 -0700 Subject: [PATCH 196/312] shaderc: 2016-09-08 -> 2018-06-01 --- .../development/compilers/shaderc/default.nix | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 9df718694913..1176d348d9d3 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,32 +1,52 @@ -{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }: +{ stdenv, fetchFromGitHub, cmake, python }: +# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use +# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from +# https://github.com/google/shaderc/blob/known-good/known_good.json -stdenv.mkDerivation rec { +# Future work: extract and fetch all revisions automatically based on a revision of shaderc's known-good branch. +let + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "32d3ec319909fcad0b2b308fe1635198773e8316"; + sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj"; + }; + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c"; + sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x"; + }; + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552"; + sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp"; + }; +in stdenv.mkDerivation rec { name = "shaderc-git-${version}"; - version = "2016-09-08"; + version = "2018-06-01"; - # `vulkan-loader` requires a specific version of `glslang` as specified in - # `/glslang_revision`. src = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce"; - sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki"; + rev = "be8e0879750303a1de09385465d6b20ecb8b380d"; + sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd"; }; patchPhase = '' - cp -r ${spirv-tools.src} third_party/spirv-tools - chmod -R +w third_party/spirv-tools - ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers + cp -r --no-preserve=mode ${glslang} third_party/glslang + cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools + ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - buildInputs = [ cmake glslang python ]; + buildInputs = [ cmake python ]; enableParallelBuilding = true; - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ]; + cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; - broken = true; }; } From 2ebd32ab0ce07386eb14ac3f4cd0c690872a72bf Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:30:48 -0700 Subject: [PATCH 197/312] glslang: 2018-02-05 -> 2018-06-21 --- pkgs/development/compilers/glslang/default.nix | 8 +++----- pkgs/development/tools/spirv-tools/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index ca1e2f54df93..cc27d19781fe 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2018-02-05"; + version = "2018-06-21"; - # `vulkan-loader` requires a specific version of `glslang` as specified in - # `/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "2651ccaec8"; - sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; + rev = "ef1f899b5d64a9628023f1bb129198674cba2b97"; + sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6"; }; buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 35e0d276101b..cada8353866c 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -7,14 +7,14 @@ spirv_sources = { tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; - sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; + rev = "f2c93c6e124836797311facb8449f9a0b76fefc2"; + sha256 = "03w5xk2hjijj1rfbx5dw3lhy7vb9zrssfcwvp09q47f77vkgl105"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; - sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; + rev = "12f8de9f04327336b699b1b80aa390ae7f9ddbf4"; + sha256 = "0fswk5ndvkmy64har3dmhpkv09zmvb0p4knbqc4fdl4qiggz0fvf"; }; }; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2018-02-05"; + version = "2018-06-06"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; From 879145e1f701964a9d5839ff57e66247d8fa8168 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:31:11 -0700 Subject: [PATCH 198/312] vulkan-headers: init at 1.1.77.0 --- .../libraries/vulkan-headers/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/vulkan-headers/default.nix diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix new file mode 100644 index 000000000000..797c64729ecf --- /dev/null +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + name = "vulkan-headers-${version}"; + version = "1.1.77.0"; + + buildInputs = [ cmake ]; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "sdk-${version}"; + sha256 = "1k01y5cj154mw7853w5xh135b2jp6k83kzwknw0dbs5adj4dx0kf"; + }; + + meta = with stdenv.lib; { + description = "Vulkan Header files and API registry"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50736caab838..be2fff2383f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12040,6 +12040,7 @@ with pkgs; CoreText IOSurface ImageIO OpenGL GLUT; }; + vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vtkWithQt4 = vtk.override { qtLib = qt4; }; From 937d6acb802539dd07d07dd7360500418fe0a8db Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:35:34 -0700 Subject: [PATCH 199/312] vulkan-loader: 1.1.70.0 -> 1.1.77.0 --- .../libraries/vulkan-loader/default.nix | 70 +++++-------------- .../libraries/vulkan-loader/rev-file.patch | 21 ------ 2 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/vulkan-loader/rev-file.patch diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b9b18dc79103..3f54bc2e1699 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,65 +1,31 @@ -{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, - python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, libGL_driver, makeWrapper }: - -let - version = "1.1.70.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-LoaderAndValidationLayers"; - rev = "sdk-${version}"; - sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; - }; -in - +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, + x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: +let version = "1.1.77.0"; in +assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; - inherit version src; + inherit version; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ cmake git python3 python3Packages.lxml - glslang x11 libxcb libXrandr libXext wayland - ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "sdk-${version}"; + sha256 = "1nzzkqh0i3j1d3h7kgmaxzi748l338m2p31lxkwxm4y81xp56a94"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DBUILD_WSI_MIR_SUPPORT=OFF" "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; - outputs = [ "out" "dev" "demos" ]; - patches = [ ./rev-file.patch ]; + outputs = [ "out" "dev" ]; - postUnpack = '' - # Hack so a version header can be generated. Relies on ./rev-file.patch to work. - mkdir -p "$sourceRoot/external/glslang/External" - echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" - ''; - - preConfigure = '' - checkRev() { - [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) - } - checkRev glslang "${glslang.src.rev}" - ''; - - installPhase = '' - mkdir -p $out/lib $out/bin - cp -d loader/libvulkan.so* $out/lib - cp demos/vulkaninfo $out/bin - mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -L layers/*.so $out/lib/ - cp -L 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/share/vulkan-demos - cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos - mkdir -p $demos/bin - find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \; - for p in cube cubepp; do - wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos" - done + postInstall = '' + cp -r "${vulkan-headers}/include" "$dev" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch deleted file mode 100644 index e8f9f92c8ead..000000000000 --- a/pkgs/development/libraries/vulkan-loader/rev-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9f73ce96..d14ffeed9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) - endmacro() - - # Define macro used for generating header files containing commit IDs for external dependencies --macro(run_external_revision_generate source_dir symbol_name output) -+macro(run_external_revision_generate rev_file symbol_name output) - add_custom_command(OUTPUT ${output} - # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of - # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the - # subsequent line (to ensure that the script is re-run when the revision file is modified). -- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} -- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index -+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} -+ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} - ) - endmacro() - From 07396a614595e626523f8758a7a37cc6aa41541f Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:36:00 -0700 Subject: [PATCH 200/312] vulkan-validation-layers: init at 1.1.77.0 --- .../vulkan-validation-layers/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/vulkan-validation-layers/default.nix diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix new file mode 100644 index 000000000000..8951f16e43c4 --- /dev/null +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, + glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + +stdenv.mkDerivation rec { + name = "vulkan-validation-layers-${version}"; + version = "1.1.77.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ValidationLayers"; + rev = "sdk-${version}"; + sha256 = "1c7m0x63fv8paph4rlha9bzv6sd0d7j277b31hh1sqkdcv2mzjhj"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be2fff2383f1..44e35a3362d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,6 +12042,7 @@ with pkgs; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vtkWithQt4 = vtk.override { qtLib = qt4; }; From cb2921c8390f27947980f71e0149bf1d5e75a92e Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 26 Jun 2018 20:36:15 -0700 Subject: [PATCH 201/312] vulkan-tools: init at 1.1.77.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/graphics/vulkan-tools/default.nix diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix new file mode 100644 index 000000000000..4e4f5a5db4a6 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, + glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + +stdenv.mkDerivation rec { + name = "vulkan-tools-${version}"; + version = "1.1.77.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Tools"; + rev = "sdk-${version}"; + sha256 = "1c827n0xz8d7ydqpjchd58as943acyi182a0p4aq3bdsaxlmmpkg"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e35a3362d9..4d5a5b60af3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12042,6 +12042,7 @@ with pkgs; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vtkWithQt4 = vtk.override { qtLib = qt4; }; From 385114da68d83c4c048cb6b529ff7902cb3d61c8 Mon Sep 17 00:00:00 2001 From: tim put Date: Mon, 25 Jun 2018 16:34:54 -0600 Subject: [PATCH 202/312] openmvs: fix CGAL 4.12 dependency patch executables with openMVS library path --- .../science/misc/openmvs/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index ef539ac9c8df..4e5b986a428e 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -24,10 +24,28 @@ stdenv.mkDerivation rec { "-DBUILD_STATIC_RUNTIME=ON" "-DINSTALL_BIN_DIR=$out/bin" "-DVCG_DIR=${vcg}" + "-DCGAL_ROOT=${cgal}/lib/cmake/CGAL" "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" ) ''; + + postFixup = '' + rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud + rp=$(patchelf --print-rpath $out/bin/InterfaceVisualSFM) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/InterfaceVisualSFM + + rp=$(patchelf --print-rpath $out/bin/ReconstructMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/ReconstructMesh + + rp=$(patchelf --print-rpath $out/bin/RefineMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/RefineMesh + + rp=$(patchelf --print-rpath $out/bin/TextureMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh + ''; + cmakeDir = "./"; dontUseCmakeBuildDir = true; From a0c36e9f183fc03eae027118b1ed10e18d4668bc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 25 Jun 2018 12:48:53 +0800 Subject: [PATCH 203/312] amarok: 2.8.91-20170228 -> 2.9.0-20180618 Also: - make kf5 version default - drop kdelibs4 --- pkgs/applications/audio/amarok/default.nix | 42 +++++++++++++++++++++ pkgs/applications/audio/amarok/kf5.nix | 40 -------------------- pkgs/applications/audio/amarok/qt5_11.patch | 11 ------ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 44 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/audio/amarok/default.nix delete mode 100644 pkgs/applications/audio/amarok/kf5.nix delete mode 100644 pkgs/applications/audio/amarok/qt5_11.patch diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix new file mode 100644 index 000000000000..855d31aadbb0 --- /dev/null +++ b/pkgs/applications/audio/amarok/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine +, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem +, fftw, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.9.0-20180618"; + +in mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + # master has the Qt5 version as of April 2018 but a formal release has not + # yet been made so change this back to the proper upstream when such a + # release is out + url = git://anongit.kde.org/amarok.git; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; + sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ + qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine + karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem + phonon plasma-framework threadweaver + curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras + ]; + + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index 461fc260207d..000000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - patches = [ ./qt5_11.patch ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static - pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch deleted file mode 100644 index 36041c136c8b..000000000000 --- a/pkgs/applications/audio/amarok/qt5_11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/aboutdialog/ExtendedAboutDialog.cpp -+++ b/src/aboutdialog/ExtendedAboutDialog.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4997706b20..342b465ec551 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14980,7 +14980,8 @@ with pkgs; msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; + amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok-kf5 = amarok; # for compatibility AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; From 08a59bb10df18f6f47170c4987defced4c4d1187 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Jun 2018 09:42:26 +0200 Subject: [PATCH 204/312] palp: fix runtime error introduced by #28029 (#42633) After #28029 it is necessary to add "strictoverflow" to the disabled hardening flags. That probably has something to do with the `-O3` option in palps makefile. This commit also adds a test to check for this regression (as it only occured at runtime). --- pkgs/applications/science/math/palp/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 3484c369db3b..5f5c000a87c8 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -14,13 +14,28 @@ stdenv.mkDerivation rec { sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ + "format" + "strictoverflow" # causes runtime failure (tested in checkPhase) + ]; preBuild = '' echo Building PALP optimized for ${dim} dimensions sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h ''; + # palp has no tests of its own. This test is an adapted sage test that failed + # when #28029 was merged. + doCheck = true; + checkPhase = '' + ./nef.x -f -N << EOF | grep -q 'np=' + 3 6 + 1 0 0 -1 0 0 + 0 1 0 0 -1 0 + 0 0 1 0 0 -1 + EOF + ''; + installPhase = '' mkdir -p "$out/bin" for file in poly class cws nef mori; do From 70212bb796a3ddf9f1d20b14859a5ec8a2ca179d Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 27 Jun 2018 00:48:28 -0700 Subject: [PATCH 205/312] trezord: 2.0.12 -> 2.0.14 (#42627) Tested-by: William Casarin Signed-off-by: William Casarin --- pkgs/servers/trezord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index a3c505646214..2db004d9000f 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.12"; + version = "2.0.14"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6"; + sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv"; }; meta = with stdenv.lib; { From b0181718cb5b3f4356a2e62bf56a882c08cd0da8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Jun 2018 09:55:01 +0200 Subject: [PATCH 206/312] python2Packages.rpy2: fix python2 compatibility (#42634) --- pkgs/development/python-modules/rpy2/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c6ece5f03038..f907f72ff244 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy +, isPy27 , readline , R , pcre @@ -16,12 +17,18 @@ }: buildPythonPackage rec { - version = "2.9.3"; + version = if isPy27 then + "2.8.6" # python2 support dropped in 2.9.x + else + "2.9.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; + sha256 = if isPy27 then + "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x + else + "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; # 2.9.x }; buildInputs = [ readline From f380b6691104d0f10112058c4b3633fcb1871980 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Jun 2018 02:30:37 +0200 Subject: [PATCH 207/312] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/dc8aa30e8c4332518991fd46e623865fff9d0864. --- .../haskell-modules/hackage-packages.nix | 330 +++++++++++++----- 1 file changed, 233 insertions(+), 97 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cc143df86607..e5d713ac4c30 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30278,8 +30278,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.11.0.1"; - sha256 = "03x204zmkj5ir3dfr1cc57k5gk1zdijgcdhrnq4wpnmrciqzx0js"; + version = "2.11.0.7"; + sha256 = "1jslvfsp1mraills55z1kxnf3x2csx9qn9r7ccsyyl2bimzj9yq6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -43899,10 +43899,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.3"; - sha256 = "0bdja5sgqv2zn7fm2cxrghs808zzx1r4wn67ln7inycjy998w2xg"; - revision = "1"; - editedCabalFile = "0m85l44fc779z9v0qwq1dj23ljkrwcd483qv9ycxdyfqwaz83a5i"; + version = "0.1.1.4"; + sha256 = "0gqaa8a3q84k5shar58kc5kfdq4f3zp2pz9pg8h78d3fibyz5cmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83922,18 +83920,18 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, containers, crypto-api - , cryptonite, curl, data-default, DAV, dbus, directory + , clientsession, concurrent-output, conduit, connection, containers + , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger - , http-client, http-conduit, http-types, IfElse, lsof, magic - , memory, monad-control, monad-logger, mountpoints, mtl, network - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , http-client, http-client-tls, http-conduit, http-types, IfElse + , lsof, magic, memory, monad-control, monad-logger, mountpoints + , mtl, network, network-info, network-multicast, network-uri + , old-locale, openssh, optparse-applicative, path-pieces, perl + , persistent, persistent-sqlite, persistent-template, process + , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore + , sandi, securemem, shakespeare, socks, split, stm, stm-chans + , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core @@ -83941,8 +83939,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180529"; - sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5"; + version = "6.20180626"; + sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83957,20 +83955,20 @@ self: { ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit containers - crypto-api cryptonite data-default DAV dbus directory + case-insensitive clientsession concurrent-output conduit connection + containers crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath free hinotify hslogger http-client - http-conduit http-types IfElse magic memory monad-control - monad-logger mountpoints mtl network network-info network-multicast - network-uri old-locale optparse-applicative path-pieces persistent - persistent-sqlite persistent-template process QuickCheck random - regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare - socks split stm stm-chans tagsoup tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat unordered-containers utf8-string uuid - vector wai wai-extra warp warp-tls yesod yesod-core yesod-form - yesod-static + http-client-tls http-conduit http-types IfElse magic memory + monad-control monad-logger mountpoints mtl network network-info + network-multicast network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare socks split stm stm-chans tagsoup tasty + tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time + torrent transformers unix unix-compat unordered-containers + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -87716,8 +87714,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.4.0.0"; - sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3"; + version = "0.4.0.1"; + sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -87859,8 +87857,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.5.0.1"; - sha256 = "10yzb9blgiya4b4cfd63i4367d71apxc71m0bff6bcp6aq01fw66"; + version = "0.5.0.2"; + sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri @@ -92384,8 +92382,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.7.5"; - sha256 = "0a0m67flsnnbh9ch6pb135avvriy0scpfx39f38d9zwr8lrrs5p3"; + version = "1.8.0"; + sha256 = "1nkms3iqp24xs3v04q3vvc8m8iviq8l38jbw4jksaxbqpwin08bm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94317,6 +94315,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-jmacro_7_0_12_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cereal + , digest, happstack-server, jmacro, text, utf8-string + , wl-pprint-text + }: + mkDerivation { + pname = "happstack-jmacro"; + version = "7.0.12.1"; + sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cereal digest happstack-server + jmacro text utf8-string wl-pprint-text + ]; + description = "Support for using JMacro with Happstack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-lite" = callPackage ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { @@ -94391,6 +94407,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-server_7_5_1_1" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-uri, old-locale, parsec, process, semigroups, sendfile + , syb, system-filepath, template-haskell, text, threads, time + , time-compat, transformers, transformers-base, transformers-compat + , unix, utf8-string, xhtml, zlib + }: + mkDerivation { + pname = "happstack-server"; + version = "7.5.1.1"; + sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring containers directory + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-uri old-locale parsec process + semigroups sendfile syb system-filepath template-haskell text + threads time time-compat transformers transformers-base + transformers-compat unix utf8-string xhtml zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit parsec zlib + ]; + description = "Web related tools and services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -98858,8 +98903,8 @@ self: { pname = "hasql-migration"; version = "0.1.3"; sha256 = "1cv8y16hkh7h421hljvi3hp7s20dn6alf5pjmd852xzdlnvy6j9d"; - revision = "1"; - editedCabalFile = "156s0y5yfc3y0mgv95gcs6n3pv9nd0mgy06x0xriwsf68wjb07ap"; + revision = "2"; + editedCabalFile = "1l2pgi50342ldf8cip2wy63clgn9snk4jz92q2sl8nlnlv5g9b1i"; libraryHaskellDepends = [ base base64-bytestring bytestring contravariant cryptohash data-default-class directory hasql hasql-transaction text time @@ -98872,6 +98917,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-migration_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, contravariant, cryptonite + , data-default-class, directory, hasql, hasql-transaction, hspec + , memory, text, time, transformers + }: + mkDerivation { + pname = "hasql-migration"; + version = "0.2.0"; + sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1"; + libraryHaskellDepends = [ + base bytestring contravariant cryptonite data-default-class + directory hasql hasql-transaction memory text time + ]; + testHaskellDepends = [ + base bytestring hasql hasql-transaction hspec transformers + ]; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -99805,8 +99871,8 @@ self: { }: mkDerivation { pname = "hbf"; - version = "0.1.0.1"; - sha256 = "1vzzcxnc3zdqgc7g66imvq141cmnzi7513hczrqjbkim0iycxh8m"; + version = "0.1.0.2"; + sha256 = "07r3m42y3g3ikg0mabqcd309jq2280kg0rn74n2ybmr1vs815fpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108999,18 +109065,20 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec - , hspec-dirstream, language-ats, microlens, system-filepath + , hspec-dirstream, language-ats, microlens, optparse-generic + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.3.0.2"; - sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p"; + version = "0.3.0.3"; + sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base casing composition-prelude cpphs deepseq haskell-src-exts language-ats microlens ]; + executableHaskellDepends = [ base optparse-generic ]; testHaskellDepends = [ base hspec hspec-dirstream system-filepath ]; @@ -113199,6 +113267,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-client-restricted" = callPackage + ({ mkDerivation, base, connection, data-default, http-client + , http-client-tls, network, utf8-string + }: + mkDerivation { + pname = "http-client-restricted"; + version = "0.0.1"; + sha256 = "0n4rmi30hlppgfz1vfqmcnqxrk1qfg2f05chdvniiq7l94id0kcw"; + libraryHaskellDepends = [ + base connection data-default http-client http-client-tls network + utf8-string + ]; + description = "restricting the servers that http-client will use"; + license = stdenv.lib.licenses.mit; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -116528,8 +116612,8 @@ self: { }: mkDerivation { pname = "hzenity"; - version = "0.1"; - sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + version = "0.2"; + sha256 = "1ckc95a9hn8blv8yqdgpcs41wdk1j3mydy5pj41cl73jkir18a0f"; libraryHaskellDepends = [ base containers data-default process process-extras text time ]; @@ -117745,8 +117829,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.7"; - sha256 = "0d5g1fiyfp1d207fjkpyfnp6hi5hdf1jsh50a06mrcdb8dawpbqa"; + version = "0.3.0.8"; + sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b"; libraryHaskellDepends = [ attoparsec base bytestring connection containers either exceptions hslogger list-t network pipes random rolling-queue stm stm-delay @@ -117907,35 +117991,36 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base - , blaze-html, blaze-markup, bytestring, case-insensitive - , chunked-data, comonad, conduit, conduit-combinators, connection - , containers, directory, dyre, fast-logger, filepath, free - , hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, microlens, mime-mail - , mono-traversable, monoid-subclasses, network, opml-conduit - , optparse-applicative, rainbow, rainbox, rss-conduit - , safe-exceptions, tagged, text, time, timerep, tls, transformers - , uri-bytestring, xml, xml-conduit, xml-types + ({ mkDerivation, aeson, atom-conduit, base, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, connection + , containers, directory, dyre, fast-logger, filepath, hashable + , HaskellNet, HaskellNet-SSL, http-client, http-client-tls + , http-types, lifted-base, microlens, mime-mail, monad-time + , mono-traversable, monoid-subclasses, mtl, network, opml-conduit + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rss-conduit, safe-exceptions, stm, streaming-bytestring + , streaming-with, streamly, text, time, timerep, tls, transformers + , transformers-base, uri-bytestring, xml, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.2.1.0"; - sha256 = "0m869l6z50zf57hfy28ad70id3phfqjwkna64m59yycvcqlkj064"; + version = "1.3.0.0"; + sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup - bytestring case-insensitive chunked-data comonad conduit - conduit-combinators connection containers directory dyre - fast-logger filepath free hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types microlens mime-mail - mono-traversable monoid-subclasses network opml-conduit - optparse-applicative rainbow rainbox rss-conduit safe-exceptions - tagged text time timerep tls transformers uri-bytestring xml - xml-conduit xml-types + aeson atom-conduit base blaze-html blaze-markup bytestring + case-insensitive conduit connection containers directory dyre + fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client + http-client-tls http-types lifted-base microlens mime-mail + monad-time mono-traversable monoid-subclasses mtl network + opml-conduit optparse-applicative prettyprinter + prettyprinter-ansi-terminal rss-conduit safe-exceptions stm + streaming-bytestring streaming-with streamly text time timerep tls + transformers transformers-base uri-bytestring xml xml-conduit + xml-types ]; - executableHaskellDepends = [ base free ]; + executableHaskellDepends = [ base ]; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -133563,6 +133648,8 @@ self: { pname = "log-elasticsearch"; version = "0.10.0.0"; sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; + revision = "1"; + editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -148624,6 +148711,8 @@ self: { pname = "newtype-generics"; version = "0.5.3"; sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; + revision = "1"; + editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -157739,15 +157828,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistable-types-HDBC-pg_0_0_3_3" = callPackage + "persistable-types-HDBC-pg_0_0_3_4" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC , text-postgresql }: mkDerivation { pname = "persistable-types-HDBC-pg"; - version = "0.0.3.3"; - sha256 = "0m5cx6848s9vxmbrxwv3v9f3vplpayxjddn7j332k3kj3qbdgs4v"; + version = "0.0.3.4"; + sha256 = "0iygm59rai7w9g43h2ypra1z4dq2rsw5vc3nwh5bzpaa6x2mqqfb"; libraryHaskellDepends = [ base bytestring convertible dlist HDBC persistable-record relational-query relational-query-HDBC text-postgresql @@ -173678,7 +173767,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_11_4_0" = callPackage + "relational-query_0_12_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -173686,8 +173775,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.11.4.0"; - sha256 = "0pai1x1hqk8mn7gqxjrchb7rcv5dc8q4iwiklb8w3band7jwpnf7"; + version = "0.12.0.0"; + sha256 = "0rp6fi93wyr0w2rhng8ymn9bdh4pdrn488l0lnm4f5ris50dz2y1"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -182005,6 +182094,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-JuicyPixels_0_3_0_4" = callPackage + ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-JuicyPixels"; + version = "0.3.0.4"; + sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-media JuicyPixels servant + ]; + executableHaskellDepends = [ + base JuicyPixels servant servant-server wai warp + ]; + description = "Servant support for JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-aeson-specs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery @@ -183621,6 +183731,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-static-th_0_2_2_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , directory, doctest, filepath, Glob, hspec-wai, http-media + , semigroups, servant, servant-blaze, servant-server, tasty + , tasty-hspec, tasty-hunit, template-haskell, text, wai + }: + mkDerivation { + pname = "servant-static-th"; + version = "0.2.2.0"; + sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers directory filepath http-media + semigroups servant servant-blaze servant-server template-haskell + text + ]; + testHaskellDepends = [ + base blaze-html bytestring directory doctest filepath Glob + hspec-wai servant servant-blaze servant-server tasty tasty-hspec + tasty-hunit wai + ]; + description = "Embed a directory of static files in your Servant server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-streaming" = callPackage ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }: mkDerivation { @@ -184924,8 +185061,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.9.0.0"; - sha256 = "0hnqcb79ncklf9zhvl70bxfqzgd19b4vs4angyi8swzmhvpxxizj"; + version = "1.9.0.1"; + sha256 = "0wqc471s20dby2zypc0k80fb0b3mgqji2yx6phygfcd7qr6j5xy1"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -192589,23 +192726,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "squeal-postgresql_0_2_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip + "squeal-postgresql_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, deepseq, doctest, generics-sop + , lifted-base, mmorph, monad-control, mtl, network-ip , postgresql-binary, postgresql-libpq, resource-pool, scientific , text, time, transformers, transformers-base, uuid-types, vector }: mkDerivation { pname = "squeal-postgresql"; - version = "0.2.1.0"; - sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs"; + version = "0.3.0.0"; + sha256 = "06phwnwsbq6w6zkbhxsfwcrgb875nmnrkn5k770n69vm21p9mlzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring deepseq generics-sop lifted-base mmorph - monad-control mtl network-ip postgresql-binary postgresql-libpq - resource-pool scientific text time transformers transformers-base - uuid-types vector + aeson base binary-parser bytestring bytestring-strict-builder + deepseq generics-sop lifted-base mmorph monad-control mtl + network-ip postgresql-binary postgresql-libpq resource-pool + scientific text time transformers transformers-base uuid-types + vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers @@ -207649,8 +207788,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.3"; - sha256 = "0n4ypg2g82ajnmvv94sgympvbwji0bkw5kmd4zfzrvzrdxq91yvh"; + version = "0.4"; + sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -212908,6 +213047,8 @@ self: { pname = "unjson"; version = "0.15.2.0"; sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj"; + revision = "1"; + editedCabalFile = "1kv5ybjgpqxq7xy8x1rgr8ia7kaffgih0z7jx74ixdijkqk69447"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific semigroups text time @@ -216232,14 +216373,13 @@ self: { }) {}; "vfr-waypoints" = callPackage - ({ mkDerivation, base, checkers, containers, fuzzy, hedgehog, lens - , monoid-subclasses, optparse-applicative, QuickCheck, tasty - , tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers + ({ mkDerivation, base, containers, fuzzy, lens, monoid-subclasses + , optparse-applicative }: mkDerivation { pname = "vfr-waypoints"; - version = "0.1.0.0"; - sha256 = "0s80vnix20jcrasra5civ2apnqjrnvi2r7ry568r32fhlgag4cr7"; + version = "0.1.0.1"; + sha256 = "0xx7j57wrqg90h8sggq32jm7hp1hyjazylgyk8pnvfmzhirnqp4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216248,10 +216388,6 @@ self: { executableHaskellDepends = [ base fuzzy lens optparse-applicative ]; - testHaskellDepends = [ - base checkers hedgehog lens QuickCheck tasty tasty-hedgehog - tasty-hunit tasty-quickcheck transformers - ]; description = "VFR waypoints, as published in the AIP (ERSA)"; license = stdenv.lib.licenses.bsd3; }) {}; From 8d0d41da0905a7768df37060c6010f2dcdedf7fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Jun 2018 10:44:10 +0200 Subject: [PATCH 208/312] git-annex: update to version 6.20180626 This update fixes CVE-2018-10857 and CVE-2018-10859. --- 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 b196b1a9ccd1..acdcccd43558 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy"; + sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); From ca131ea634c7be56879a98a005967df16e73a547 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 27 Jun 2018 18:16:24 +0800 Subject: [PATCH 209/312] firefox-devedition-bin: 62.0b2 -> 62.0b3 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b5e17363a51d..8626b9ef6649 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b2"; + version = "62.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ach/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e8a73275e443ca96a98e7be86aed6fde2d260c679d8e6c6abe14cee34a7cce6546fe2d67e3f6e459e70aa1c24cea4e1fea5989e1e445c010eb09c6c380e92836"; + sha512 = "fb662a573025fc9f8e4de57d81f0a237b507040a040844150d55d37210296873112de5cca3a57b3f849ca9d4ba4a11786d8118446b0d190c2895e7144945ab28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/af/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8840407317ba6c78d8107eed1dda66b1cadbcbb3974408a7591a0b707d48a315d8510bab6745928ff373557b322abaa5004e4ec72ac47a10b8f3e844a739078"; + sha512 = "000ce0eadeec614c9ec6388932fc0835fe844966be86516b71c9baf33126ab8e7245231da12046ed38c5b0f9ebe79ac1af61ce7d0c39263a8e890032bd36f24a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/an/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "592cc4f177c6a66c25c1921f15446e2358a2cf248747e7f528b9f0c0bba068454c7adcea39a7c1b07dacb17512ce530bef57015a3c3292fd87a312855209df32"; + sha512 = "b081b77430f9a0f9d4459c680f6b544acb290522308bbae6c2635791d325c3283afa3db97e9bdafb446a9f2265f3f20836eade5a687fb9f38811cb12e7af2330"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ar/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8914a43999c7c48bd2d6b898cf809f1a7bffb41f64f12eabf6821eb7bae9dfd47431636976bcd746a219e951ec546b45257d03280e4d1805098d14fc2c2b66db"; + sha512 = "6e9fa89945b9ef32cffd2fb936151a642e0b5a1ac1b333e22406fd409087c456e64095edb371eb244af2100cfc0d36d4b106d7fee6d67d9ff5627d3efefe0434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/as/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b25747a2c9fab1e0137f39d7c620ef8d0f6d997dded045c8c7f8eaa1167393357ad555f7e82597169bd2f61cb88eca83269e3e4f6f4a257a1cf97dbe9520cca0"; + sha512 = "53750c2fb6abb624c5fd645bd08406bb4d0dfbc7094e128a773d1222f211d25fa4ad042879e0aab53a092fed0e6d4a1997f941662afda2bbd5740a6946768241"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ast/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d577dbd473dab2fc618ada2d6ebceae37796a5401f5d7dbdf6f78fbd2078df79d612280c816105a6776f8a0f49dd18f46af4def052af351f7e846a90a4dfeff4"; + sha512 = "26105f6c7568727608f70351d3111f2997eab7a3670bec9733415b8612c38f5c780568ffd0da4ca840ffd12a7fa27b4e7e34cf8749817762f9d805e0fe4e3bc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/az/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "c7713c7464582b96584f4d16f1cb70321503c971052d135dfac46df661cc8569661041b5c9dde1d78e7c9dce7a8f3794210611f961cdafab11445fb8907e606d"; + sha512 = "d4d0507bbf25810e39fb348705ef950d1d0b85d9570b72d6a24aab5d95a5860632229392863aff6f719cf41975299e76b57f337681d233be9f32fab2a3a6ec57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/be/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4b1129d50cd2948ba7168bec3a9f2e380672da29a5ffd86ba69a7a1fcdc7a154b35192176da97bf0bab284be53f5aff64c7c9d07ddae3f7a38395b97e669d365"; + sha512 = "d6426e87f85d76da37e58a3f2f59d965bb96fd8d10c066130fc8445dc753c04fa9103987e29d9dd2cde38d1123d63f3741997d823f14ccf51d57746fa3508070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bg/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "be0dd58530cbf5a2d1a45ac83b8a5c6876f27ff603ed7e38c26993ed9730984ad7314d2191494f3e30eaccac19aab24ef0d2148e965162975f24d2dbbe92bce1"; + sha512 = "e99f471aaf2aadc26e6484dec1a0969da2459aaa7fbc4c16bae76abf5bd325d43642853aa6b5b1d8b7375c82f69a5a012743a2a458c6fb365f8429a4d4e7c9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-BD/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "17d9323b7e6bd65e4af89be8aa7fdfcfe3e090e9d8a911c0e6403f9a8aad4238acdb5e259e958e78b11fbdb51b65d9eb62b1c0e322e8cced623250d921234887"; + sha512 = "55e3d8ecc06fb8d12310ec6ed6a7458c7f0f357ba286ad7a4967880e0da591704133525e989349f57696a64b168a532da3d167897fb91aad7ae0fd153bf96f09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "544f72273a6db0d219878d3ed49567fe2f0e5e72e5c8e3b85ba0ecacb60813a5a3ccdb1466a9c0156ca44622a2d451a6b93fd3303b2512135da89d0430bfb928"; + sha512 = "ca0940bb07232cbcd9143547a3870593b938979f4aeb6711e9320468f1b55bd8da02c363be6450f9cd6ca4320e0b41b401b21c8b16b7fa8238f4ececb1cc82bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/br/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cff328e9154f5c73722f9245f07177a97d46eaed99a03b3177f3eaa83157a9e584caf8731e55c73896eb2f8c01d16e7ca899ac6ceaa8bdc43bbe68c21d90fc13"; + sha512 = "bc060aa4d847eb5e3694f2c88f536de9dee2f0e83967f3ed3559894fc91f483b8cfc9a160d57d0c97008f145bcaec2eea5b7a9a442439d71cadce35820765c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "eb419f8a8cf848ed8913511c8f7fb5585e4171d9c2062900f693face140d91bb5cdfd7ac413be4df928793f5b5d7780ab3b877da596848b8255d7fc0139efeb9"; + sha512 = "b6ad77b36fb6613234aff3e120e8e0954dfa430287c6a48662c8affde272f4449a452104a215a25e075b6afc4e4b3d7ceb6f7e9439e10ba4de411e7c6396be39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ca/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "6e113bdc0ec10629d285a15dce967699d5299ac82e99744d6b707f338b0e407d0a03803e3c70da94fd13e460887e66919edf7d5ed07d12b9d0d1c21de811dc40"; + sha512 = "261fa5ad64ad6f3d58d87ed71843105b12ad689372f215be4572e23937cac0dd648d8bf722c614c08211c864045dfe8a7f65eef45a297666a762f80a62cf56b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cak/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "639a98dc336f0b11dcb9b98c4c3e2a81f47086cc6ef4eb9f22eacb232832a3fedb071302bafec8df0c4f819afb4b0dc95c8c709be69a06ac16eea50dd44c8f9f"; + sha512 = "27feba8268ddfe5d12876520f6dec73799802ef179464c54c44fc134fa18c15faeca9d946b6d3f67a8b7210cc68130c7373167aaf1732f5ed9df1febd6077860"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5fdb22988c3f04be8974e8746c2b3f3b794d5dc5c317830883e3ffee67c82a2dca21f45c2e8b695be3612c906d03bfc54db5fc086c63a35eb9b204eb7177e18c"; + sha512 = "4f922f1a443c630571c0389b816db1880f0cd386326778560461eaed7ede66700be9f69294e90c9339295009c3ce2a1a2b3e545a73f3b61854f899ae5cfda75c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cy/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2c89c1ab0808d85cfb148690265c51a2c5af3a507799cca510c3c1901d2561a27a077d0f7f1136f61b7db1a0eee1ef98da61d6c16718d0effe8621c71368264e"; + sha512 = "2a36df61f32b2da0a3d0e6d37c4f7e9fce3e596a23feede17539baaeb74f24abdc9fa562ee6ab6cad57650b25a1e117a20d308cbdb30a07c59b11907efdc631a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/da/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "40544a20f4826d7b91904690ba0c3e2a37b422309447adff63515405ee46a73ee6e9741f42a29e36055420bfd917fb732c179174f7536c97fe8e745aa791eb77"; + sha512 = "4840577c308c51eecc349fd3780311a9dda632c0ffeb3df10bf028c3e6ad27d0fe5fb7c572bf706a69fcd49ab9de83680023ac4373abd46860b8afe8e6d2bd2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/de/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4b2354b069925c77e3cca77c49013ff3f5fbf8586c0158b83762dad1ab3028a35f26eb3f80cc79f8f7c729adf23d1ad8f28f81b1210f2a79c01b3ce0b8e9bdfb"; + sha512 = "4767e6bb638664c9abbf4c93547e6f9498e84181b5924f8f96a35b8e7e3cc11ab04b18cfbca38efa075274cc9bd2a036e25f53eb84d462f2afd7abda4f4e32c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/dsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ee0922e704593acda845e4d5e211e364625fb5749794e1d945178462a2351d12617823917d0f79fefbe9dcee24f4dafdc174742d12a778ec6959471e31bc1005"; + sha512 = "4620c84dea2fffaa684554ec8517a5a6dabbdbbf4f60b999a490e70fe0da5a1fa21ef2183e089414b979f0529d867bd98ec892df146507502eb81ba6c2c04856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/el/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f07de19cc17675c777e66341d771a3271b558318358af1b379dbe90ca23c01451217680fab80980fbbadd9a82bfc6bea84f8b8568dad00304b22cab19ba933f2"; + sha512 = "12ad8e39c55f975f82351e1499ce1ba78565326eff521f36c87d31b7500f3da004c1e8c72c98cc603949c8456cbd709f8810491c6914f5c42e6cf8b05eac4684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-CA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ceed256dd96a3b356f3cb89e01d10450f33f5dae8f4224145cea553fc825c315c2f3b9bf670c80cd0648e31be56cf2f988ec62d95f0bc554684baa35f59294bc"; + sha512 = "0f7c43bd7f5586a1ec78ccbb2bf424933be3964c16c2424adde1e901c0fdd5d523adcd974b02e09999bad66bb719a9976e7749b8673d303613447861e07c65a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-GB/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "723cb9937c49bb44a425c4a8f8ea4379ca97f11ab1aa4d7108204211925aefe370a7ca3fa2ed68dc38ec4157b866c0c2988c5c1b375bda07e9acd8b3b40c53d7"; + sha512 = "5c234d1017b65319b129e8430469850e9c5d25990df2949e16dbd610cef45bcb5061d044cbfd0ef95cc0328f9c27eb239c251b7d41388677741e638349bce26e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-US/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "386a86c641c225508d7efa4a467b981154ea41c06a5948d09e7d6c3ebe4e8cd9236e52ab6a5ec1e543b80f9402b1e0aea26d2a7b2bed81b742f3923e2420e92c"; + sha512 = "638b97dd86c548b666220b0b4e785d49c40f8dc46ea006416b7f66cadd2fa511040604743c921bf5c156b06fa26007859d26923ab39cbca0a5def80c9e171ffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-ZA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "60138c99ad5413379646ae8939be17bcf4bdc205c850a21d759b1b15a53740326cd4bbdacdc86e1affb7a6f522064b3f6a61a14c0590b5a50755c5a5713d3703"; + sha512 = "3a64761e9083c5b6eedf25c6641534211d6325d9b97b22a19a413305ecdc697d75bd06322f04c7b84c08ee077685fd23da3363306a31ec3439794333a2e264cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eo/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f03d76e59a2ec73cbefe815595febd99225b3a88b6eaee721dd714c6104122f7d6380f43270808ac7d58a958bca77f346941a88cca0ce8d280988e3e7f8b56a2"; + sha512 = "d244bf5d4a4f385116228b6b3f306d15b8710a969ea50580e91da861b97ece4473aa2851ea02bccfc73dc183abd523089c09da320cb6d34e1db492ce0bf58cb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-AR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "43b3d2e06b37e41bdade831238d025bc9ed244ae47c05c97059136926bc07cbf5468ae18d31479daabd57200a03cee3e076dbe2fbe9c82393b649b74dc640aea"; + sha512 = "5e53d61b916f9774c2471d941b26b72e5d1caef0c1997a1b435b1f57b70cb96ffd8b4061ee4a3bd90c2d480fb94314d2f71d6be336ced511b27b447b6dc2e6b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-CL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "50fb64e738d45199b7244586093f939392d9a4aa4b94f34724d8390a749f55b0da32278a7b239f48802fad45a2e497cff5b745d6bd805f98de5c214057192d4e"; + sha512 = "23f44b92bee6543ef4919554533a2ba35e1597d4ff46246047b4f2f0e45751c5739f00167f535f39c8f06415bc63e204a5b38152da33a26cd8dc2f713b3ebb4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-ES/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d0252a66a1222b1fcbb3fcd57cbd5e11da901409b714911da4642961e854174f9b082bd0694da0afbbc6864fe6df16a60c7a02087c1d4ebd9443306ed63cd292"; + sha512 = "47b30177bdf420887782067817ffb7618b0aa73a4777568de97e9b09fd86ca3d575c1b00f8ecaf24455ebb654238dc873ad3544818353d48d18f1202fd96c9f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-MX/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1a989fa0f586bab19a4b4247e11fc9a74280ee8c66e6655c309fa8413864628742e9d41f60a3f4097523aa90f0ea5176e84c38daaa34853509e38596339690a4"; + sha512 = "34749402c8fbee479097d411981b271c4c5f3fe17faa7a22684ba4755035d1316b01b94e085a0d7107f3e14caed296c37e96007af32ff447672cf3732bdf6fa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/et/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "640a65fb860b8678e547c79a0b5c2063a87473ff2813662eccac2e9a47ba57fd41ca20bcd200cda8fd9e01e86ebfdc2a8510534c1d4a4e22ad6f100a9533f2c5"; + sha512 = "093f375d961b48a70457f31c007547341f72eb86f4b91ad84fcc8dd2bbbc4b23a2b20d2422904f9959b6906c3075166f82669b30938525dd72287e864ea98ab1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0fd6c238fdda13eebaa18784e78158427fb94975943f0b0a8d07ff1d8d16d7ecb2d34b95417237cfbf2ae3c63652c5b1ff39350de2fba38a959b5d8b6b7b469a"; + sha512 = "a9dfab6c92cb6a78cab0a9e2f1f273bed2d54d18a918367cd8e1fdd9f96dfa9e065bf4205211e8c95c6e085c947aa48e22a82c8ef4e5b87f94829bf6de4d1547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fa/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1f9fd5d3c6987a3ce9a10aa057d9334e3b2dd050b1b240c4a704e3e3599f6e2b98bb776f31f46284c16109b0eb89e533bda4b48dbfb22dc5a804df631a60f22e"; + sha512 = "5e20caf1360465aed8711f914d2d6d727aecf3e94b6b19cd3264c4b0fd567950bac73eb602b2a7813f6d7bae6717aa598f04daafa49960c19852ba8dbb06f849"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ff/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9a11342c02298fbc3f8fb3bd0daf38796f70db7aacc5f2d127d3b2102d9c732347fe4bfc9ca368b7d6181c294091ad2cf7d8bb7017eeb3abbd2fb9180ac6597c"; + sha512 = "4d2a56f24d2be12653e3b3a3d5466702c2a83a3e2d6a3628897b63e0de8653dd7412878a6fc855ee37f588a3aa3ff3d587ef544b4f81dd8f73042fa9a2918243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4b8ec3d78c38db9078e128c0c7b37306946053c1073972a8960a3299e0419e42526c762e6fd8da95b14dd521d334b85bd61290e3759df186bf305ed1c7b2cbad"; + sha512 = "ba75525f36e0fdd30f030b3490aed77ea5ba53a21da526871d1813882bdb11aef2576448dc066d0aa995a0ccaa7c3740b4e19c88c4c9a6490b23432800637b33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "96ef7135fa52202ef8a6aef9ccaa0a2e29a43fe1175d0be889a41ce92c731a31cd7c1809dbedbaec2e16a832da5f3d73a3c77a0703d8985a62e1ecddf8a267e6"; + sha512 = "bd8ec59817759393c6a248769873673e05591241e172404b8277709dcfa8496061fb411641145bc51bc7c34b26427c88088199ac1b7314c1780e312038e48643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fy-NL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "767da4cc0d82efe65c1c740ba8d604b1d50f920daeee5fea2dcad5efea5f46f168ac8d27a15fcfbd0af30d6df2c3f0210301df2c7006a5b39a207c190c0f7e0f"; + sha512 = "af9180e4773207eed96741f8aaf0448e3f0b0ea061a6d9d6059f01cfe6f9a599a0a68c54868e1ce2428b5b6c3c5262a8a5de545dad96799c144da49e591184bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ga-IE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1828c79bc6d80649eddb9d8fdfb7b395e66f3ef5fc900fbeb3d727955aed292a782fe8a413038c037fb699b49d93b72b645c699868f55c823a68e7a5abd468ba"; + sha512 = "2cfe60bc05ab09bd86dfbd77d5b9cfd0b768cd8c9cdcee7772a712056cb0aff70ddba515e10fd5f2be29ca4f82e1dd8632cc131a30d70dcb183b3dcd1e9e5f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gd/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ab3f9798ba035a33bfc4cfbd576b883e2d677932e6f8f75cd1c129cbdbd02323004fbabd69a26ffeb34d4eb2197d0e079fe1fde8044eb1b4c626e87cbc800219"; + sha512 = "2a918ffae1c37d06aedb5e33cb3771c0879edd31722fc4afcb50b58be984122a573b59130dbd978521c7473fc24584bd5dfb05e46877bd885c9468d20050a997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c9e0d513265faa304d17ed8471da5ef42b84e6eb8b992a22e267b29545eeb72042061f575b5085d5c25d7a1f9dd222da53535670e5a251eb6dc7d2cd3b700e79"; + sha512 = "0cf0fe3099b4c1967c152a95228eccc8043c65324b42f87c2dea5d33a3bac93672eeb93dc85c7d12f8768489ee071d6437aa6efbcbe6d5b81a7129ce20da1312"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f0d2117c871fe61a0b3c4f2b08bc1a35b25f892ed08231f48c84fc4d88180b7d37fcac08550eb06b49fcfb76188ff08e89fc23933ce3205e3e7f628f242df826"; + sha512 = "0156f9882dd2ab3a02aa2916eae8eeeddad584038bcbd79a877ccee67bf24d2095a95817fc4add01dda9680db6d713f13629d83e0470faf84187b9a836e0a489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gu-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "35d62c047992a5ad288e905fc4f386f3d3618df2c42f617cc7c2be777604a8a30d17c14e4e7ee21f06b35657d6cc8b2743379836d433652c7509f6c0455956a2"; + sha512 = "78421ec8446122895822893559d5d1d8180a38158a41e04529eb165e7e68f50d0419ed60dd6a94076dcea270f3cf492376ed1ca8b53bc67cd70e19a18fad5c77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/he/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05c9481db1ecb833774f808a33db96f4848fc260751f35d8e9328916a5c298c8c174cdb55845bdf5838edd7ba323d9c6dc6566609e359a5746ea09ce2566f8db"; + sha512 = "77fcfd12786a328f27dc59b1fa6bccf3427090d557d4f2be945f575d3d2b46049d293a400c74496ceabc24b3c17e6dfe6fd038c1dc9ab9460c5ff807f30a8993"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hi-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8a92fa9b24e54fda81d15b18dda8432dd94e26164d58e1dd7f65d5f744c905e8790693557ac15bfcbcb491032ef436b3c7c01651767d4b43dc663193ba47ddbe"; + sha512 = "4437886e4647b086556b19f3530c1974dd429b6ddb1f678ae3fb3448bf75ea27a4ad153692328d22d8e15ad21233ada1769e6ed7222560d26ab2f1c4cfba5f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "432f9c7429900cc929afdf8e7e4905606a7f83652519d8f0e5991aedc99b7eb56b73ad7820efca20250df19ed68c0b4c409a4fe2595961a23df6f3982447d3de"; + sha512 = "f0226760fb545f730a218d24129e95a2f0739044421cc91d921377afd0c0118811cf3f7f26a3be63ebcaf2f0b259f5279a2b4da17399e9ba076eea6980f9816b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ac9b1b4053cfef117b4ab4218a5e27c390f6eca3ed93bae5067e48863512e93ecf037e60efdaf1cd5e162f89915d35ae5740c77b4ac91b3f4204c3e4de250629"; + sha512 = "be593a431d81bba03f5cb9d4e15a2e31a2be4561c5b89c585b23edc08b618383d8658d4898320dfd34483de95f483176e5fbd9c6493f72a416f040a3485f4eee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5ed2987282e18a35ee024b6fac92ce28ef0d195c8747b1072fe03bbdb8eed719d070b2ad74549d74f9ec0fd88b41a83d22c5dce9d1a9e09a6bd9397f99bd4db7"; + sha512 = "2d3e066b7eb24c948759cf62ee2ceddafd86b51b73a67e306c78ade75661b3a6a47c1dee51b1b43057ddfc555a64c523befce8e17afa9008d7e2ee382c2e3c28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hy-AM/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "419aa9d8513edb65c3ce94cea7ba95bf44f8ac38e24f3b0ca63f0b02c01dd2719d54fd8b8f4128be5cfcdd8cf4c45d709b5b74679a9419fabbb630fb8708e4b8"; + sha512 = "a23afdceaf33a3ce0bb323812cd6a1e0239b2f2c4ba688c601f8a158e64a2635e1cab1313edcccd337bbbba63173e9d171254e00ca3bafc6ebaab4297ed6584f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ia/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fb6f815b6e0ca4b8f4da7a423186b1973222bc1512461944aa6cf1cd1393bbac274cd612b7e17f19a27e2229c6a594d50f7d15cb9acd21932c5a5871cf24d04b"; + sha512 = "b36bfea78825a783d4813f9454d9fca02c6ac9ae685c7ab81efebf3fdada08e76b2e02cba0b19fc6a1809bab46dee01dfbcec2fd57fa83186de092e5b2744227"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/id/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c1f9166df40952b2b933bc900bb8db65c1c744ff7007cf93efb8c8e9d5fc886d4e97db92e7b0fe58ea245b6239b109f297b6b1c5e8751aed1fb7bf7c8549b218"; + sha512 = "013c40d4a0775101cbd66078c62a4bd28be2335b9bf38350474fc2593b7fcc43c5caed4cef4ad906245ad0192df8de38e8fc537ecd6a48afdc97d5141738a2db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/is/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d8f60fc52faaec8a02154826db63a8b7e976cb8667bf05bb8485f61ac3b29862d9a0d4953815e876d6019d99c89b76ef45f6d1be14a1286b7bdc57cd06d1cade"; + sha512 = "f9c95cde0a4927c5b7e3d2920a90ee3229319fa8989b6c7e2deb2cc864e12822b156e6b44fdc8b4ed6d8e8bc706e323cd0e38bf1e2393eaffd32040eda2faa78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/it/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5b2815fd990934dc49d750311592413c7458349e890d3a74d0d342ef86a1cadee8d870bd515b454d566d0d51866dca894e06580228a437f59ed793ca8df9de0a"; + sha512 = "3a1f50aba975761e41626b3e5f3f6619dcc09d31a27899e4b0348c45af5079883de2b67135197e7a57e448172e55cb9bed4864ad6fb9e0e0c0624152c180632b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ja/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5267ac59466a24cd3b07b33ffa3a503b907e84cf58e87d682a8173b826a7d7cf587fbd52d0d8be7732436f6cae5a638e0d0ba02d1f614ebe828514cc67457209"; + sha512 = "b513ec2ed69e0e8c16a53404fc3b891181a581101972e54ec509f4f2b842d2a18fda2b6dcc573bf3a426bd06dae4de8295b12d016b81242d93bcb1e25e11557c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ka/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "920a6be8aa3d0b3557e170a310496a59555a49833d27c777e2ff446f001570b299872d807e0512a6c37e42d44d6c92cb213138170a04103a9b2169c84744bf25"; + sha512 = "520f4d76371051d4f97a3ecf295031b208561b5ec1bd81317d63fe445fd80d75f5ed8fa866e2e742073a8fe6f92cbe018edba93d4ccef50d1f78c90f598950e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kab/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5667c3cc41ef58e816de3212389d61d9cdd02f577915dcfedfed9a55bd050873578f9d45a05357952f7b8c77a218d68164fb71d04bf669d5fe4e948cc81b8752"; + sha512 = "c0744662c499216249ccd2c8a926933c00f2bca52fb3c8f865c5f7a0e0a4699938dd146ec94ca16517bf9f6502c30dc5695c1505c033ff6bde3c08af5bd2966e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "17bed6ff7dcfeebc40c6f703c1881ddd872e7ce212ae560d3da27f14f140b72f7fe61fe59dca41bd198a7499e64e74b0775ea0a95200dc2270cc5f5ee6fe67a3"; + sha512 = "aa939d0305fcb03f62bc704fcd1aebffc2389e69674a05033d268dfa87eba3c31828ef70a658c072766afdcdb2435ab451cf47f9a4776d6bb5b15bf871b393fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/km/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "11bdf73fb720d05d6952825c496d77e2ba3bfdaf07250912dcadb79d954f63eafbddedae2eabaa7639c17a6437268c4924e48a07790ef57f1ebe2734723c5d58"; + sha512 = "cc0bf0b7332423df05ffb8f3b22d02765f5a8a78922ee0b6bb832cf7d9117bc8a79e4abdb4b06008736db8eb519fa22eb929aac37df443e788305098cc694418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9375a349ebefe25a02ea74f7ab14616dbff8542970f09b9bda5df521d7ccc48c6aff48270b6123295c77848c8fd47f3d985bec88a37b2188456fd57d89d2510f"; + sha512 = "4e90b10dfae4126cd4a5f4855118ed011a7cd2f54af02148b46a8001326aa167b508e053a259105513f4341982b163835ac58d5459052f847584aeb2584e97c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ko/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "cc5be1a62f69d92c48edec8e471565001a9a62dd9d4e9d1415e0cf5e4a1853e0a63c161725ff3c21d5fa58fee826bc90442f107012e1da71e1b4b353247edb71"; + sha512 = "2e3645774a2746be83e18169b0b0dddfed5e89f0c7d804f76b1e672f3606ab448359e3086085762a8cbe1ea3431ba73f4ebad94f3819624d8bb3b4e5edff9cfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lij/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "5ce170b3e6c28a0d2d2efac7b0db94237ab9f8051c5f799ad7b07fccefcdc6072826781b96c6470f8d1a78b2821338bed58cfd43014ee8e23b7241119451a74f"; + sha512 = "9ca670bf8828933e587c3d1ed2f4bdd730b12afcb757f88f50e55cf79afcd51a9edf67f0d15eb44d8166bf8afde2d54bce1a9a3f7d10596a31f7f73d2b1d4c71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lt/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1dd418f20c4cf2d268c39bc3bb91018a60fac6c284e1967d26eff30728ae706b528a79b47ad91104e8045e428a47df17ecffc6ab91beb1a83bc76465be7bf7ce"; + sha512 = "be2de3a6c0b9510fcb6e1fb09d366019e7a27517bf00c85a33ab35719c091ac821c560828ba6bd4252456dad2cd5d52ffa16131d3c4024c9b66d02584187f6e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lv/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "227994d4be37899de8ac58019b79dac43191b4e46dcfda40f28691b87e495f42ae83d00586d7c278122e6cda09a18b8b41189ed084927013033070247f24d47f"; + sha512 = "e99ab69dadfec0765ef4c616c12f919fe6fdbc048e96e2b2a67580e5d36123cf3e0dbdb2c45066cb535ca5c1b7b1f151a779ff6b93994026ca88ca558ad6fd71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mai/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2811471b87a09360b70075e4dfab80cf3dc29d298ec50e8a9d516bc7e3dd2af57ad9c23929c2c7eb7253a27f47404a4529aca2af5d837e43807c24f184338e23"; + sha512 = "6d57ef217c9f51725586087c366d52421181f4fd90744f6481d923fc4fdc094dfff5452a39a307d8302eb3cad84293feb1dd5319cf3007dbcf895d0a11219982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c48afe3b8decea6832634bb861559e156c1617b64320b57a028c9245b61ec2681e8a9b2ffb24681fc42e34c2b3176d98133e24d6337fc8e450d267646065eb8"; + sha512 = "64d24756a2c0ed9b237d2241150ee0b45618c2f66b13f29d0c28f0a77fd3893c5845ae29d93590f461a9ae67bd18e6e6bc07597a8e55fa1fa98b8ea2551a9048"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ml/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "92009904ea47702f0119fb17c7ced25a7b1da937ca9f11e18565e5848469a90eea4260e2cde370fcf8ec1939498cba84d48b4992a70cbc79a5be50212dcc2601"; + sha512 = "88d21818c5f251676f67ae42ee498a55124104bcf9c96b4dc92d490b0d3ad33846edb7fb9011ad53b6b85c7d5a7fc7540124aea3b89d37ffd6e8ab60da638626"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6790c045ed9c73ac0426df2091c14054740eb8386c0f4b6ceebdfb65cf0c4cbb39f31a389da74b3adc922fc6e62ea0eb38482f7800023e7b28a4071d539ab978"; + sha512 = "7b1fc11292246ad1bc87421081c4a2c45e34ea262b3ca2eb77acc619b6290c8ba25db3465f15205496d662a6ed6eb9ce69a46f941eeea4b0009458bb008482ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ms/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8204ebe6cc36f76c1385c73df1c4d4e966caeac6207ddd85cd6f000908677d219e6cf6821df1ae92150695cdf4f2fb811d2f649f21d3aca35349284dcfbf3edc"; + sha512 = "c790907f60b92d67e2a100607e5b1a8de8047385eb777313d0b349bcaa9ead166c2a51295c25269fc9a9928e228b76fc981c58842097c3294fcaa3f3ada870b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/my/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "05e4fd1dbc9bcecd1980071cf953c5dad0993e718bea9c01e6e62c8f9b8bc4d8657009da1d99cef75182d15d3d8b90f306bd62e7e641c5a19c873877e713eeeb"; + sha512 = "481f21afd3dcd418749bdf8eee509d35c915003e92c5db39fc41f3fe84ed9f83f3a343eb83c195e5c72f6c48f69fe878798a6b8df80c80f3d6f23811f288bc42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nb-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "26f3bb008850b84f77b13ab68759e929eb92a33fa68e226937a6d4a2e17b854d741b9863a37375f97a7d89602437a414c8b4c0f76a4f71bf8c86c9054730948e"; + sha512 = "51f8ea1ec330464d69b805ebc0da9130a0a08063b0c535d6da4b0ad396f6073947d0bb28bfe19fd07d0054a32afb96d43e9a3a83cc65356d921295cc51186c73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ne-NP/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b1f09b3976e5db99d55836f664469ab0d89849130b5ae1c73d9d772ead471f6c9ad96ccabe440f1479ebe60c0fb4ac52bb365e5d57f0193086bdd03fda2937a1"; + sha512 = "57e69cb671901ca78dac898c4c304bbcd19f1c54d63be2dcaeaf921ea26d6b4adfc6ffe415547fa5b2b871c6356e65ca21b23c5e7160fbd81885d17e9ffca682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b4f90d601cf101ce6b99371100a92322f19448d8fb208d415be12f7f80d30547bc962b30a455cc1c5efa6eb2e69985e194a83a98a7bd7e69bdcdde126169c142"; + sha512 = "8dde66286a7fbc6eab4b7ad6573aa4602172ae7b96cbd732cf4886512f1cc085a9659a3943704eaeaf99b8a3005400e3d3cbcdf9452768575910cfec16756f9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nn-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3fec29703a1b76817616428706c42dd240b05a4c0729c4aafb2bcee1942144234ab3b4e717006b3613b14df831fd7dd9edf318d46283c3260243e42eced1e63e"; + sha512 = "97f460ce8d17b03f24f13bdfe6119f08c727523900eec0549095dc6c97cfacf4e9081447cc8984d33050196453a22d47dbb7bf205efe595eeae794b5c78088cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/oc/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "4e60f8a294d4da610d8ba52bf1e2cd0d4e76ba2574afa0cecf8b3f657015868b53e15a0462efd571975800055f91b8f70c39ad36a17a37857344ca14b23568bb"; + sha512 = "09e0e00dc7c06445efe7d12c46b77ccfd749726a9b7e9f291dd79025b14f07540b741c949b64d9eea27fd6549a3ed0a3a4da6034b25e455bc124c44e5238a6bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/or/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "1d309ccb6e0f53f8a8dc85c1c2c691f8728be063875a169560cecfb3feb11c4e5a0a075602e0a2aa97e939df98d5538d96fd0cd0736370c841cbbdb2b930ab30"; + sha512 = "ca47ca122004c43b9ad3e46a6743b3b16595786894fdf9e90ec82196b1aa2a4befe6e75599faf2e12754d301f74fefe318afc9ff994d27e696ef94ef2af0abc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pa-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "56fb76551693f0c739bf0dd42ed10c5cb4ef8be33e4f229e6ba42b83e2111bfa420666327176219f45177db7cb216007296c3abbd000c4426cdb8e2b4107dfa7"; + sha512 = "a173b1561fa796e914200b8ac027a8fe9e57de7806ce72ca7c6126c1fc3cee2cad5694ba34c2e2dfa8748378192b15721f14c01b10344eaf073fc1efe51d0005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ea8a5f453e78e3df32e56991a2bd940b1a104ef857af83552c5a7b7d85223a3dadb7c2b10d08903c515de1f11c207108249d1a4d868ea2174bd8cc4acbbdb76a"; + sha512 = "935dbcf9df73b7f2a689e81a7726c4009f3284ece8ba4f9a5c19326842f8dbe262ce1d68d025c79d09a2317a0260344ce110f2a8470dbd41a87aa2deb20285b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-BR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "97d564ca87b0d1978c1aa96616714d208797bdac9b608500df3a3658a3724248f731265c3ecbc1adcf518a47577ff6e9cd150a96f75307a578e9e37b8ca4cc63"; + sha512 = "8b783f8b348b021afd50447b96d931ea3e59b607ca0e6127e680af13959c2396b952f9d9395a21515b27d9bf0718a756c6276e54fea169a58783f706316848e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-PT/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "cff3873a8e66f03b9bde42ed27361761a04455c755f2f4b4780e92d0819aa08c851bcffbce937584164eed68bddf560c21e4d273147e3e2db52fcc376f12f5fb"; + sha512 = "2f0b3fcba8ed0b14b6270d4fe3dfcb1a4ad273e3723191bf2b041fca7776e362601a2e06beb6a544957fc66208072e4106d33bf8b52a2be0610f4db21c651c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/rm/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4e46719324957027c1659e13da8d2c306ce89c85db2698a8af00142ffeaedda648639f562035ee3c91b16cdef44834a059b76b0a7ff8645026fccc832aa5209d"; + sha512 = "cb1b633c75cb08d1a84edfd315e02f3d3056f70a3eb382d1ab31dc317cd37522c7719a23eb1ab5f89c11711e4ce901e23b65f7f9182c88008ac964571c844a27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ro/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "99f21fab8546dec02584972d1917a7b72fae6eab929a27e2823ed3f4f53865703acfdca5ca81443b9a7417635a2d7a0e49ae0b24248ba4781330377255a0354c"; + sha512 = "2d56b60d2843bf0a526fe1ab6edae613fe78ecec4acc4a603ce107d2a67b286d8e6098dfd1fadccb77335977a0401ca73527ff8414a6537edcd001ff288bad77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ru/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "207b795615e39357b9349d5985519328ebb493d4bc29b43abf1f7003bfe75fe0fcb21d3a8553083cddff049b5d7d46b15428c58d862c7cbb7096b162bd1c5df2"; + sha512 = "32cbeb54cd3b9c6edd56d05988d1fee6617b2aa8f0166f4acb07cd701aa1cdb03718edbb6fca776ba13103a377a31cc65e5800a49d1466500afc6cd8a92baf8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/si/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e96d47336868e7df0ba39e8036bae96b8883b6f4ddf90b3fa6353e46bb61580efd46b97ea3bdde8f3af53dedd072abdacf72fba747b98ebe46c6955be6910165"; + sha512 = "06243a2358db5b9fa50a56e6302878a1cefc4fff42bfda6bcee57a8996314b101a61e544413c1cfc3e72555e88b0e946c5691956c33c04e44fdb199bbd30844f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f1f3785f5ea509bdfa05a5dfbf41689d029d06af3bae1e143311397158bb37d6f232f06c82900a853470d2411f47d974fdef318f9082c46aa62299afbfbbb5c7"; + sha512 = "642c96e2dfb5f809504c27754dacc7dc604d724e8d783373b5c3d37c8fb5d2c159f4f7536353859d3263ce8648c53740eaf7ec7448c165718bf9f0d53870df06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ea0d91574603c06ce9f2fadda962ddbf1ab45f11618652d6c1f540119dcf41b904e2ca809bba8537e380525c2698eabe7be559539bf650b792baeebb118f72e8"; + sha512 = "4a803d3a1ad2720e4af3aaf1540ea56683a4d22c76beedb0b6928d7c5a89fa5bd36233a675fb85ad2d7d6f5c1c4cd7ab5e5ce77c3f49ca71a195cb93fbe37d1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/son/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "338391b220307b5e13822c6bc6ebc46da07530a6bab71305b3aff7e3d938494db0877d19b9a2dbee6706798402d93ba83db0c9c63061b063d15b25ebe2013df6"; + sha512 = "16f89877424340062914fcdb4be8e4d88bb0b6e04104069fc74b50a54c8610b4f766cc4623b5e39c794d2974144cad610900516054af51cd963529fa4d6d37d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sq/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "74801d764972326f1c96197ab2f4e8a20b481a33638c9b54f56f6d627b8610f7d22fb9ad309d04e84b9f9a931a2a40a0afe473136ca1d0de6c0f809169cdbe96"; + sha512 = "10c97decc9c113535042386b005687f32c16a6bfaa8930f23dd3787e7753d2c41d94e6dd5caef6183f0d3f72156bc5bbbf72389186b50a8a7376e5abda333132"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "17fcab8886c7d3cae3ce36af19ad7e3066ac45dc4f91b57cca7936cbd34fed1e9c0250d220cf02804298ad07151e3e247eafb398ca6d4a18076f36e4de431db4"; + sha512 = "8d34baaf402bfdb3bb0c3c5104a9080da4d5eededb6d55b490a5a7c62a095f68e2e0534691bea826281abb91e7f28f3fd4a22076aec0e1600abd31c94c937f10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sv-SE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8caf5d927039be97bbd67183f9e92828732e6d9cd5abac4ba0b29de8097402f0080c827b73ae244bbd1e3a99532c4e9f3e961d6a172426d342f9c9a05133b459"; + sha512 = "d4317109b5309eb355f5bdab8edb0259840b0ff940f57295851491d2dc0d8ef5488626bb952fda4055e2459ef502c57a836cce688a99aa88a570a388658b1ff3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ta/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "53311054be09b410e9a5c4e319e35239b70ef5f08a7f5f127f437f627dbafd5938d7f41410dc0179768c167e4f4a84ad78b6d9d3b2b2e5cd40692e1c162195a1"; + sha512 = "6433f05c761095a3efc838eee6d46f8ef2337d6fd655c79dcd8dc95572875bc13d393ce98757c70c895161becbac3d3e08458ff24a604fc8c389405cee7fffa1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/te/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3cf97c0a96806671d4c78af3a928a373ae4883c1c49bdb59730b74bd5f19cfcbaceec81ec48a918254dd35263b8a58c3e1b3ed2d443a9f58e3a6aa7c83934637"; + sha512 = "07c2413be438177e6557b275a308ba5198b3332a128822a0ddf5c51dd13b2c2b50249990b2d541b58180d6bce4c4b7c42b984cef6f8ef9e4f62f5f0307261484"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/th/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0baa020a46e27660644b2baeb299c466ff77d65fdab54001060ebe4682e6959128d7aa8c1b008821b777fdbbd20b36f40bfe8c099072df3bd0a0b4884c484ec1"; + sha512 = "fd82735960e4ea6db66928a022796606bfeb9ca00e889c6140d224d7a6382f1f0ba55f3cf171203a110d5429fc38cd84353296fee950857dfa0e3ea5fec2f22a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/tr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "36a7668168dea9a0995a416d1c0612930c4f3d2b66622f04b89e22c438d0e95adea57de6ae766d1c22dd81fe7d4cccda9c7e6abd77160a36edc2d505451aa139"; + sha512 = "16b41ff0ac170a58f2dd8eb7adf0a7e1ed68fe88bce71ca594daa26e1881358697984a46dc74b75d5d4d554be28591ef570e9da672390eab57c97a9eecd36506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "48086676df822883aa7e193af088d15988ffd5034eb526a4656ab02477dd1832d3de3d12680d2bd7b25f1bd771a0c87c10aae421f9020f09c4fcf527267f538c"; + sha512 = "fd8c5c8aee503dae022dd76a6e4af91c15796219c05a8350458ece2f6ea0bcbf15a461a5be035df6880e1d3aa287e447911023ecdf36a59451e44bc2cc819063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ur/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a7e2024b5721e70c0118f13e4cbb45108054fa3b2f7702b7e219287d0a380f6e769d4e6d1a65c766653e7014c223edc607d5962cc62e6a0a18559cddfc7247fc"; + sha512 = "12db58871502288ffdad76881f4d4b7c7922f22f4317c1286984035b6ddbe9155e3f0bac2f4645c3bb5878b491d326af68234ff69d046435a8ed1b5f2bcc2618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uz/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f88b75d07f5ceed0fd0dcdca03f30ef866c367a5656f1cba5a6bdcb8543bd65791c51e1763a333ced20b4b0b10b292b2d4e04f81b8dfab68607f5e9e97d5e53e"; + sha512 = "e3d5c3df93ecb48e685162a751f9eb225c063fd2b5a8676f7956cc1e3a651529dae38693304320187ef8f0eeb92c2fbe0c3dd7541443800d235ae0059562c0aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/vi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "15dbd0458d883e0ebfbecae7d6d506a1ec4695737373deb881f3a10895f4777927ee1f6454507bf995db9bbbfb5eafe71aa7883939e1ad1dde28cfb8cecf9103"; + sha512 = "6e4eb1cb75f36c600bb9211a5560578441c0bb4ff5c58e75d07025ec98843e74e01299ea1686f45b461aae664dca68fe9c2f6352b389cb8229ac4c1578a4e494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/xh/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c6f9a216713fe8cea1231cd2caaf32bed366c961f8c03eed4d80689a00b28e6a61c945e7bc4458a30a438c797f6a576eafae5536819fa98b70e0422a081db4dd"; + sha512 = "695ec0a3141c102270b09ffe55045b539981d68d35b13cb948570669edb86ee7dcb34e3d246800fc155d0126acadec73d97bab0eb5f7e63bca82270cdd3659cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-CN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "59fefb1f8a2218f9ff1022a37b15f9adaae32031a2869e9aef0bb48a1dd44133b812573dd0cf63edc68abac4c5bcd30be9ff44d8ee7c49348d969cf456cffdea"; + sha512 = "a94b0b7e67ffe5e3c961df0b6ed802ea9c20a6054236b5c17b638a1526bbe6f65392ec9eed2de6fc64dc9d8904e72da98f7262812273ad977694eaf53609295c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-TW/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8efd164392d3309be8fbb7fa2718f11fe877d78070818c0a443b89a0f9bc3ef3689fdca2c7b02bf69783542923fff9c482b6d2916a90b40cb68b3951204c8a65"; + sha512 = "ec12bbb68350a10ab67da8160be765a5893a497a373267efc992bdb0429eb17bed9526247a313ff72aac4b491f42fdf618d4b03229d5f7b8aec7e680b60acd03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ach/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "629a3a267deb22985d2ac17645b004b6a8732c694e8d5d42d533ced212df0b36e74ed31a2870e11a841193ffee3d9c7d56f092c623ab3328f9e683a0a2c39e39"; + sha512 = "377a6ec42ee65a5002d6abe5f2c6f949f64914ef28f86c6ab4ce7218fbc689018f2e20c17660b340a34e047227a48cb0f9ee566ba5f390febfae4eb0f7675d6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/af/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fa0cb4898b4b09e592f3326517459a356e41edd53cc28e5615a7883311b43ae728f9c80f7c0c3e114186aa8ab9465e21af38e3a75215e184e30e2a31014de1fc"; + sha512 = "fd4558780ab15eac16d81e35b8ce8919c5968296d3c407f5d937dfecf72d1b63d53548f1775999a01792cabbc0118ad8c118c03f9b82e51abf1a6fa0ecc3220c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/an/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ea862964df4a53e2a57b858f8b6a6d26743de5a49a68a6807cc86ac3eb68330eba2e71c193b8bf3fa70a267258825db588c4da43b2c0f4b0fb002d4d9f5b21e3"; + sha512 = "3dca1d995e534f9f037e13809d65fa3a59f3d97ceae7e3820685886130350ce3e1da9f6cf8b75dd213f8c1021cde55c5f215886f2e045ab7f60d1910c60ad4de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ar/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "79956425e3086e74fa4e693aef7f7a8980b5ff8d2660f98d9f1738c538651fac13f1decf76b124c5a8e6b61f8b1e7b9a11bcc5a451b832f38449a00485e82577"; + sha512 = "5e3cba2868e67303d6cd340fa6540aa0a892ac0d0a81fef8d2c17586565a68974cc88c92cf98e2dbe79882c5897ba9229d0bcf49a883f64b7c0697cc2fdfba7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/as/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "efd784691330dfc8601e145cc8b537d26505f533e453f771629414adcd4da1f4c047811acd5e628dc40c1d4f32d6db38ce92b0fe73730e131a87ffabe15b49f4"; + sha512 = "dfb1e492f247efbc86a326e4ec3d5524a0b9f16991f80b9d10d7da2929b252532b96a29ee32ad38bd151c2260eb8f3afe924c4c897b3171606db42046fc70641"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ast/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b588d2b98f573b578986f1b5639e4b8e5cd6f38427c8bdb5a31377148772d2e0c843c2e89765b9f3d75e3efcd1f228cc84f47da5df67cb71061058472d3d3b5c"; + sha512 = "bd3e42054d2e52eaa683eebd163656d69d59df1b479341a5236dcf46ca9195582ef5e980d5bb44df2503010a7f406b1fd3678733754aa4cf2405995a62c93ae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/az/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3aa4592c594d548d779a2282de16672ce6a836b49e7dcddee75e1d528ed7c9b687f9ff380e7a3f0f1dd94c9c23ed8889eafdad1bf79404f54b5b6e73d219e922"; + sha512 = "4d159eb67bf68275f000af3027dfd6059c532254ed2be98297b0cf8bc4c622b902d8bd17c00498600892f431d87dccaa6177cb8991ac37623422e197c5b3130a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/be/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b692bae3de9a79bebd51a700174030dd7c7b8e4d6de34b9d7ad6224dfc476226d7eab1149202a4337bc5661fcf8f23ae3e76cf07a5a182c9e066dfe8cbf13889"; + sha512 = "bff2e6c483a3bba92d591e57d4f3c7c144ef1d43ef8d86d64beb9e0970ac585b04175135228aa43eeca1d518bc396c0ebbb7632e1d91909e92239269d1484393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bg/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "541e62c2dafdb1176a15034dda155be75a5f96278e6052266529078332d9e89c95245c9af8880ee033d4a5d40a6a1ccfbc3ed0f8c1c1e574927841d3e2fdc8e6"; + sha512 = "a07453ebbb39d427df3fcfe83280dd53519eb4a3b9aefc975098741d803bad430d84de733ef67b7f50738ed056c8db9c0867f9efa245a15c28955ac88fadc180"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-BD/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ee598835112d2369f496559afab22ee91599bfac35e26bf177bf7d645c33acdfa5f0f2c4defde697e36709b8b65d512226d18046b10536b73852a7e6279aa8a7"; + sha512 = "4c5c0d9bc4d9169d0d87a809bfb7740fec274c0f05cc1927e7c93058b948dccf66b0d3e35d111d1bab9c03496f6c78a8619a2edced3999c13f06e9522feddf02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5c4141ad1f91755d02e06cb0c1c9f39b49aefc6b43f35c2bd4eca92ac855dd316b290f799065de995a73e2415e2a2c3c78e82e5aee44f50e02b3f44b49017136"; + sha512 = "e6e2aa7643901ecd94149d2ac90f6d190edddae8f6692deecad4c5b619e75538765840c968f78ebefad73ccb85e05d429e6c20d040bbaaaff07513f49ba7fa37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/br/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a58c8fbf96984fb0d77700918990f083993498c284a4e38a2b24832d6cecbd960b71131a3e0da3410a9be9199ac63f939a278249fb38143e2a5eb1cec41378e"; + sha512 = "6802ba52185ff5145f0d4dd6f33606c3a66796b24b4a43d8c3ce1967ddc916bdea935eee11453eb0e84d4a557784cdb2511c52ad9ee52fca5e9df7f6e70d144e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "649a526b35c4b0b4dff5fe8fd4928fedfe63e2efde8d97dc1672ef469caa068bcde72f9a176f8768d240739bce37b1d26264f2115bda6d7f95c9b37e0aa184a4"; + sha512 = "16af58f6127df1b72bd672d1942e66adf6e5fdcae8a43e18cd3fdaee592468f492668bf3272e15d440a123b97d15e913a668af3f069615a295e9de24b2b1ba8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ca/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "36ae7093d941e0523107593d466de2c42c2b8cb293ec491ec75e824cc2ea34d579b57f06e4c0bd563ad5ac44484fb0ddb2679aaa195aa1e0d6f823042b502fa7"; + sha512 = "9bfbe17e3bdf5bdc72a346c909c1e8c97a3158407b1bf937fa1b6b86fba831607401b1cee55dcd5a0b3553849f2f1cef8a5adcc563c44e1a88dd1101dc7f8700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cak/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d81dc145819bb8211559f42958434b2fefd9891144e4d4024e7196be70c549483f8f25e34863643095dbc65a182ccbd1cfa7b1fdd46cb0a7ae5dcee1a3d4c6a1"; + sha512 = "55f887c4dd9d8c9251982a1274ff0986b3634fea2b974cc0edfa42a1777d75645314e22d5c1583990c5dc3448cc6ebb6b6ada590a9fb8673cfa4949b19c970a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "75c7ccaffaa13d563a79c71dd21bb262ea128e8ac12d81db18255d2073910c78e264a77f3e7e9d022d316293bec91d4209738b805a49b421f88ecc992049fbf3"; + sha512 = "0d242c4d5ceb72d21884589ba6562617000206faafc4a55fa984ab083e35f4bec820e5d75ff7a152b0ffbd486798de18f7a17cc6cde9e5fdc52f3b2d1ad0e076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cy/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "818f430ba479e5287df5833c4222b65b7fe733805a1e55d664829032e8933419012ea4dd01e3c6ba3f02fec7c954dd4d999cf55b49464c040d0649d7a81ff455"; + sha512 = "0c8202cd52179cb76e7037a6d3e19bc362ddc66742bee71b1df8ae01a016437ac10e7723ce43decf28d5b31020c625021c62bcd9786754296303ec11960ebe18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/da/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a9bb147b35ba5da74dfa2dce3c8422d8d6b224aed390b1f2438a3a523b3ab6c182db6a2a15ca39db8a3e730e4104b7c5a8043557bc9d91d3c6d116bd8411690a"; + sha512 = "92017b5cc8fc9c7d2973cc40c870f3022aa6f0a643b41425f436c458e19639c1e46f068028eac9956ecd33db5f73ffcccd208a9d694b3d749ce69b2decf7ba32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/de/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1976bb7b371fe9e9da812e76fdadcc6d1cf95f303cfe7f6f72fc1b98f2ddac3af1bf0665d74c22f5a2cc41046b686cd59819b2bba923d5c02ed956577cc80682"; + sha512 = "c454fdc29eb41afda1b9ff074d41b471fdf31cf9f75e4dc45a8e5f94d4d526f928d88918dfe9617f95ed755cd22de8dd4c7fb5b64f7566e3df70beca6795c897"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/dsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6be5e34ef9e5a28d0a92c5e7c638c0e902b59a596b03ce03af2f86d88e4567f01a25005284af49cf1143bf1b3e3cec2480dd04b0ac0cbbec7b85e8876308a02e"; + sha512 = "e80c89860ad364d66913d1c67d05057bf4fac56b17339833bacdeebf0e55ee20dda723ae404364fb6d4bb58728cb4cd13e7660f11fd5cb4c29284e5d67d27a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/el/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a119500ce6aa1f2c26041aec8609b88cdb1e87eb3cd8f56148a0894fc273f3899a3923b765c8b46e25010893a55acddc24b96c15bcef2553702fdc0d4bbe05ad"; + sha512 = "faff2b3992f2ec2c312a68e1d6562a3d5d72b9cb29bdb4a0503ad1b08a9abcfa5f934b2ffc5cb85a9dc5dbd74d772b5e1d239216510c5825706be406380369b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-CA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "83bd5fd70859ac58f142f837ee96e9241ef7ef58f603bc88b82b5272d296ebb4eed8d8a84a64f105e99bc97ae739e00591f45b46bdc9d369e8c613d196e864eb"; + sha512 = "24643937312c2500dd9f7cae8dce49564e5e891b85b97be408793d7d0df9797fb43a0e03e685b8e3d84011d87da46b5036887d66d69ed4b9301b89454b6cfa47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-GB/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "533a54c96f7ffec3978cf02c3bef945b4eed1bb81f4c5831b8b85901f84d262869e184620e470ff41afdef75dd3f3340ee904632304dba285ba0d4c13a6e3ecc"; + sha512 = "66f84337f0bd9f25069cd086d5f963b56bf372e3fec1d09e4bc6f39a94b6b177dffbd95c829eb0e78914cc915b55bfe7b5e25f14cd594339c7ce270ac77a2667"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-US/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "294fb79215d8f2d0fd2a5bc721acdb3c3062554e3172161ca71e5a64534ff01ca61c637d2dff4a5396c64cc88f40b493e96f07441aa6aa297d14ea9c5be88f29"; + sha512 = "a5ddbe8f111ba737ab0f123b888d0638bd299a715b231ccb40c2f92b1abdf859d8e077fc80184becfe675e4e35c88dcdd720b85f57c4d4ccd814b355349e1a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-ZA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1b8ff2d6c331e1e5888c50aff0529487c918114de850d8d8d60e3dbbc45b3669b56272b3163d7ac15a9c56a939935358ebb7761f21184513bd3dac4dd3a7113c"; + sha512 = "d6f01366d3fbc8650576f9ffef64c23672b638003e5da7dbf66a2c19ee2b3486f0e4dcf724cb95daf2749dd4b2875f2037d8211ecbe3a617ce4afceeeaecaf1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eo/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "0ebcf307f388ee3a6f58a9383207f3235d29fa240a797af4d7fe6d94e552203c1d46a1a94b4dd5d30d98d12ffe4a33b322947c684619459e86e0d4af5952ff8e"; + sha512 = "aa1e0d8b9f25893ecf6397fb017e32aa44bf06d57b13366528c5a59ad6f5b88dae0dd06784a133fc67cb9acdfeda57f56147a3970911a870b6773f8c1773fcf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-AR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "24f2b7beb26ee6bde3c47a71ef5ca547c276217044e05c8f13a2be35ad96f8d387cdcaf0a8401fe348034f322ef4392a8f77711b0d43dc02eb74cce9be262e20"; + sha512 = "59517a73c001c4d72b33f191cac521c7f4982b44c942185758ecc2a451fb41811198c771661966c550ea27d747ef60bc7589209f9680016f9f2296696b52a649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-CL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "3d33ee9df1712971a1dd4bde372e36b15e81b2ca841fc3c2096c3ba45119923ae3f1bfc37b9911ca751a161b90393722b8af0ab196ab92607678316d349e3acb"; + sha512 = "03b89336a014fb2b8f10227f210b33a4250eaa86604e65cd4ded3407d8b960ac1d2f67732fbd5ea7d8b0fcb25eb17f431ca69fb1820cec234deb9e68fc2664c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-ES/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "206eefa522da06712c655955420bf7aec89ad0174ecefe132741e0d84cffccd4bdb72f448cfcc5c47e1100ca9c532cead8b50627cf18575e53e2c383bfa23226"; + sha512 = "0e023192c1b88270a6a1f6d7bad506233b47461f669949912b84d502fb404db6d797b51eb35ee898f10ddcee6d7e2ec98c46fc1c65d7a79b6cee1b47056a5b3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-MX/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1e4c3a10e7d2f34aaa1164c7e92d79d3f21928d5d1d800f9cf329b0016d7a2468e76c37eb2038363863d8ffa1d2da0248264d1dc7dbf21ac3c41d03b793ef4e5"; + sha512 = "4ccc60cdacd9b5144c56cdbbc8d51c41822c5a6ca43713080a62c46924627ef98dbb259c22842aaa6255b45bc95b9a72c169352e505a353be95886036b122bde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/et/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "770fc7f02278d0e7fa9d3d18bd943c6d1bae90eb8b4ffd1c2d9087c49e6e9a990a361d168709811aa7de5c34f5923efa7d1e44d70a66c2e0b126e4776f10a0b0"; + sha512 = "3472a528bcdaa138dd68a44e872da9f17b3e3dd0cf99e1bd9cf99057fa0a71332dad99df2eedae82f015e3306531ed7575d579e94391b0d1262604f9294c6f78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "760c630e156d3ee0dd5a9f836326f47a9adf88dcbab14eea48520bdc656cfe4d5722655cf2a64e4235a2407453e2f3a40e57a05d53773e1827083ef9ee5224cd"; + sha512 = "2cc55b33e020985729d144357329429ba803d3380383051728e42824bbcca2da27458f42a6d4cd19015e7b14bb175ef104c02a7416fff69cdf425699246370b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fa/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "55bc4f4cd68a9cadc0dc225e017f29d1b631a31d9b62e2731a199455e3fcbaa7a67ad41a40d8eff7848a69c659dc8226656ee848328924ab214ce360456f42c0"; + sha512 = "8874887a56222ba65fc675cc6c98b99ca5934121b3ab358fa1bd9bf284f8e34dae3d705010dab891d7f4896be0526f5c050cba688c06b55e90ee8ae30ff5813c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ff/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fda4adbd6b98533d348368095fcfd9e2a268e0824387755448a737c17a8b7b1d82a9de4c1081756eddbb9ac6bb33ed2a637f826217c0fda3ae6c61d88800e963"; + sha512 = "1c58c56d95834bcb6dd008dba4454ca4f21f63698bfc538d4e4f1565a09cb12735fb44067173637baab3ef530b8eddf28a0aa69065a2b2049b0dbee8f49483a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c4a93e9769ca4a88687ff5d050d425345aea97d9d15cab4ab89b4ee9263df6ed7c30ffaac17434e35c6b3574f71a24ebe1c3c7aec53d81870caf4884696aa878"; + sha512 = "3b64e794db0017d38f15d348181ef8a93d94f88d8ef69b5ed2171af7f1ebf529835783924286d55acae1eeec944bb5f45dfa2c59639ac258f1dfd56eb7120710"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "88df0803f1a18ef0da2f5b2480c6ae039b3f079eb2894db760170a3a535513e847aa92a70f8f42925ea5732a91235b0a3ccfeb7cf055406bafc13c308e45887b"; + sha512 = "d4022a1d25798844582c39f71311ea8c416dab9c2554a510a1ee2171acdf26c30bc85bfcddde07b29aec5ba0a30f1c3f957e2cb97f9c4dbdd9e539685703ca49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fy-NL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "445b24fa7a74e60e97bc870cdd94ea2f9ae120d6a788bd4b44c2e496f62395f89e7112c0b309ef27d66d76da1b3e22b72c780c189275ec84a511c7d758c81bd4"; + sha512 = "d684855eb69e1574311493d9b86be37486e4391b48b377019b53fbc119cc10ff5364a0b004f9fa64575b84404b0a49c75780bdfe29d5a06c37d217558e025ccb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ga-IE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6ea507929c6d886aa7f9c55b097f732bbc38dae75cea14943d1db43f11aa5501e0b99821ee33816cd72e8ee9bf138071fd75f7eab400e5ac04f424a591f3cd52"; + sha512 = "7874e6b777a01b696310ea96bb6ce28355f9aab492d05a0529ac9cf33c7ed76d896aa441a457ec304ed8bbcd6346a95553c91399f62938c19efeeeb5c3c08c27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gd/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "82b4a68795af8fb47c024a9675c75d4ac5d4e6f09217493ac2dae1fc0f4fd2bd9f5ffdf89f5338c943d26e250ad546203a0604427d0d614c04f1cf191b1c4c10"; + sha512 = "a570db98e06387e46ec29f14ee2048c9b7c8e4406f8f216748635ec471d2073a843039e2d6de8aad1773ec82e97a817b005b9b4f2200922d934aaad4ed950a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "231777e852a8f09a99aadabae38a16de21939bd492ce239c6e112e148b84c9742eb0dfaa12354aed277322d763c1d01d5f946477d9608eb8dc8fc6942f6bda4f"; + sha512 = "959e9863455c7802bd6720dcc8203b426e00bc17038785c22a00ed7f8f6c6942fd30548fe607bab66c7e234ffa4b94408a4bc0591b78674e097f9be26d465967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9a01dc496021e351bfc1169438ea23ab5e01c5e29df95b12c2b0085403baf076e29ede5afc906311a866069695cafb5ad911098a1826bd1078cbd1ccba048fd7"; + sha512 = "cc8f2acbd0830430192c14a994eb0a47a6f0366e2bedab3fc43e2590e208440afecdda67e0571779b7003d2f800f1705d3a2851fe1f5c9d0b08eb855b09d5154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gu-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e453eba04e32a850db6884c65616d0c33f5926b6c5f8e791dccfed565ba15a6d07878ca5bf91e4d7e329233e74ec7f9bec37052e5d57c37b257f47092634419c"; + sha512 = "eff0f28add6f701db024d6319c11a95d6d82437cd42a2b1fb608325d6198301af361cd02c77b807f894adca8e3c418ab2bd6473b2a9be7a6a038d147655f3d00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/he/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "12c9ca53789b1a72dcfc311017fc3e4ca286da7595f0198da02a6217b0a4ae1c1e517822cacd7e63df7481771141cb505421e65fc872a0665578bc5b8bec5bc3"; + sha512 = "6191a8070cf7327e2cecc4433744f43a173daaa882a0fc2b440d9239af8e2e0a579b9c3b6da608fa0951000f527adf408e43e529a09fea4f232adf44f1fd1afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hi-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "da90ba70059980d76b342be7561b81fc1f1d95c04995f8a72827ba7009b4652b057b2dce1f359cb6ef5eab2ca67dbe2bbb8cc9da3df436cf68f9073412aedb44"; + sha512 = "3ef5346c74bcb81345aebb4be162f046392d84792a5024ce438a460d8fd147082a46e38e97b24c99567d880ebe4f4e8b84c9a83186bcc9f36333aa2ee26b1192"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cb7295b08bc58e989067f65143644b5716689a4d5878e24880fa54f77b455ae9af5de310ca087ce78d7028eb8da856a25f87d162e7f0f061b6f2d061cee2e91e"; + sha512 = "3550f03d1bcf399664d6a53fb932c5d1eb7e6de9345055071f14e65c7672f767d58983bcb0b95c77ba02a45d734f3d6bf65b720edfa6f441146765ebdebc6201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "36cb530230d00c7b0b78072a2c9017431d93296a291ad6436088564e099298848639e86bcac3062d056dac9d7b985b4717a167b037b17e925fc269430b1bfe95"; + sha512 = "2048278924a2d413c1807a15e937933cd76a02b8daf56ed44b89ec789cfab5d0ac4d666b06ba282350b17f96ff72755b4e52f49bc4fdb50ece4ff78ddc6c8833"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b91a1efb194ec8cfb8ba9be21cad49eeb75c273b3af5c78b887ca44211ce5a678aa1b307b4c15fd4c5e1e24ccc4b5c1d1e758bebbc20d4302d3ba06c2da39146"; + sha512 = "5ed4bf6277af178fb7c92c6b1c915896c02b35581506da5ef5048289199b501e690f44b5f82f857d8ab4a9ce737d36fcf761437f80f1a6933a934fa746c5a5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hy-AM/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5c52fec228d283146654741b634906d5ea5a172f99e5bbcf9233a330473df4123192ffb44318c3399d35000b8533b9542d5567df24558b2d312b0e9565a961d7"; + sha512 = "97170265155cd43aecae59534d8876748a64ee4ac336037f60202925dc8ed84c3b1d0dd49bb278d4f3f20e1e1b87158270d710346ed16d2839a9d32fd6f0b064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ia/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "05ec2b4348a2bcd25d1c0110a6e86cfebd0bb1c62c8d2b931ae8c3fd9ffcf39a41cbd3be52b3522d62c5f9bffd41f3a47ac6fe6c2602a784aa184146aa698232"; + sha512 = "e0b22f7c2687368f8255c050750c017edfea66cfdef8ef0f37d0d17a4f700498ddb6d567cee655292cff74be204023927f85c5a709ae0f32bb919d751d258538"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/id/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ba2931615fc7468acf361a722df435f6eb6e9002c57c1cb30439343b16b166fd78e17571e250c4aa8f2cc803e34131fa61afd582b7d78f59ef858ef3ac8c10fe"; + sha512 = "b430ee23b6a5b26b218e8d23622778b0bcc70d562188018900bdd14cb66f25114448ea263772c9a38d6db2c1a97b89ba69b1d9d855c1fd9d737d6626e19e46cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/is/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a2f05aaf639f22427872d84ff3b03893b2681984f52142d8451ce211f1f0c3ebaf8cdc0fe11c7ae6189b5e2aa21c82fa4dc4060196eaeea944b0a3aac7929bea"; + sha512 = "88670e161184ea78f1438bf56f66181956a18e31eb16735cdef1c2024d59fff3d0fc257c691249a1d93e96321ef80601af17733b347bdfa485945b4d4f41992b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/it/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "749f03441d05b11ce5f1db1594d56c3dac530876a179c6b98a3932d082637e70102281dbcc7f988545f7b455fde4e20fd99657b1a318fd5e953fc225b08cd699"; + sha512 = "4bcc1492d278b3d7184ca2ddd494e31ae0689f7edf198d75e54d3c78fdd3f9a3f2a1839efaae2838ecb6f10bfd63348a4ef4a742f9f256a22f10d1049d50e244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ja/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6bd637bccae955eb543e648329061546e1a847a0dd3a7d730f73cbe9ffb2eeee0e1ee1cfa900ad6a2e2988a5cb70e3a7284c3e13e8be8e9620bca6d35805eee9"; + sha512 = "a3e1bc8b5d1939956639b5ee52b154b1a26bc7209db675b4d29bab67ca7f0dac925014ed10ca176bf6bb52b1749207a4dc2d504170c97b24a542cc95ba78c61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ka/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f4a0bad9c3ec2f45039f87265eda6d1c6b318316147c0cbbbe0c4acf066ffb2051070420edc21c9d005d06e9d7d5b2b97347816cfc4386aabdf5ac7da7bd1010"; + sha512 = "13816a6488fb90c56f951d44db171c8b3142f366c4047edbe31c10e3f2834abf329c45b9b737f86107f0dc6f852e825e1978e7369fb5f10a51c578b520678148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kab/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ee9023d4c7485810bbf8d506672083813643ae477234b4aaa2beab0049f12aab83c069bd0a74fb4d7248f398c3f23e9514191d093dd8e40c7afe12ce5896a57d"; + sha512 = "a5bf1a8f85876bdc2b289e1e9688c7b3dec6783167cb14d5049b04e11f4a3efa1ba885468ca84ec6f8109e5363dfc1f3688020459532290416595d4d92713b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8dbd5851b1c3e26b69cdf5176f752ffa39eb3c10449d6e28cb4be7472969550599e939c84d16fa600fe33bc329141d0f4d64c77e74072b154da9ec83f186cafd"; + sha512 = "68401c28fa4389a98614a40963978bcab94b15d2d9ea4818b28b488d905e9b223c82e1f3aae9bcbe2dd7da6ffd9d3d20e10dbc3bb4ac7ba182e0b7833c074093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/km/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "629c95765741b39acdd44cc3bcc509e7adb3c2538a1a3786fdef3f856276a6a876b1a42df1a462f27b4d949e5b2c11adecf49ac196cd834f24c3bfeea9737825"; + sha512 = "71a8d5c71839c48e3117bb93735eaf8d56fa6d762ed46cd9514e91a13bf968db9c88d8c8b225d9842a9e7726ab2658568df7392cb4c45f0d736f60d2ed9e6f8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f4bd52a1253e5f8d258e16051de1da8aeeb13e79a79b8b6e674253b1b69d3f153e75c75b9def32053e7b65f4d2de154ab83f5bda3dd7d7dc6763e2eb858ee3b9"; + sha512 = "d7b4644db963ef737eec03981cf795dd279f49cf87893a0647c229ad55dad45c85a42462b6ea94fc44b40d145853a86b0dfd92094ea17c441f0f997800d8b5a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ko/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bb68ef96316f2e7960e80c2351d08f98301da66f257db5c3326c7daba7d352b07ae6a408f7569f1b88f1ea35e060a6e75b2c253f8905078d7e48aaa6e9a7f9d7"; + sha512 = "9c63a2d88f1c6073a0322d4464ac801e70b16fc82eb9ff544e1593a9d1b3478b123724d323062661b548dc6351f42e5885e659bcae94b022e4a7a79edf93bec5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lij/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b8eb9855fbd1cd4f8bd1ef9a033925ec7f355a9c053369798203742b31c0b077618a7f31a2534c6e802f2d48744b6b08edc3024d30dd1a8ffa2dec10700568c3"; + sha512 = "a47014e854a7902098354556c389dac98b8b58ad928f65d864e70f74f6da47b4c4a10d2383eb18cfc3970d2cedc958861a912982b3d648d60c0f24f3662b1cf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lt/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e2174d2aac6f82cdea13a8a9b60710e149eda357a10e084bd566b336fecf63a04b34372d343f54cfcac4ec03781f1cf67b1baf5945e9c51b65015e3487dcad85"; + sha512 = "41d66d0786e84ec6b39016d96536d41a011d202d741d1322d025f43e50a7d47df9216afe859700c3d79e6a2d4e11297b4d0b11ba6ab9de7f303f07186a58b0b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lv/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "467cebfc8deac42eed8d8d8882ca75ac8c4686bc98afb04edfbf6657eae2ed249cca4d718c328c14994961582b79f32ad5badcf43b7ab542226f80f288fbf87a"; + sha512 = "e46264a45fc3b68a161558fd3f1ce16d0d2a50179109626b133ca398605f71fa09b51de54d5b4f063645b8b79d220a9b52dfa5cacf05f0eb4ab43677a17d5359"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mai/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "930d9ee5f07e4b23a69af055524fbd20380fe17692424db8e34f356607592a100e58045e0e90f76256b4c00cc5c09f1baf2807a98669ef3ac3827a024a6a5f14"; + sha512 = "fc43421d4976d4a5f9c9c86aa0ba3eae5adeb8244f49edcbf2b6e94acae2006b58931e26d2f627e02b9119e99a4e45216d48f3d687cdfff1f67b837115a14439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "95500e1e99f10145e380de987616b8635219458cffa0b776da9c912eff3844b0912f6d58aa9964ce7d455e07de599628aef8875eb3175fee9ca057267eb679b2"; + sha512 = "7dc4e4697e085af373f144efd50e9710ed83e9bb7d6415f7a1c2f5323555aa441bd1062893727aebb0002cea5a8856703e1f21d181349babe72c6b01b3e7b2c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ml/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2a38a511e7dfbee4ad96ab5d1d01e56a3243136826b46419ec3b19495ebc942adee52e9b3f369d7168fdcd5ce239f957662ac16b289c71fc14690f87f08403f6"; + sha512 = "c0a584e609a230cc65203b4064e6cf88ebbd83884f6a6c4b6e09c677076e99256088c99a9d9ef2dc0ab918bcda10f679298edba3d4b713e8cff066a3bae86502"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4d62cd91c4503f3aa4fb807ce4947784e37e5e55818e65ad7de77b49ea8c9949a514b489f0d47545c3e6705d4b1d38fa417df113b2b1cae93bb143cb6bd09a26"; + sha512 = "4c49e33fbb66025ab682196440277b78e4241c05573a383ca925f789ef5c049b58a366b7af121cefc8a6f10181273d3ce86c2a80a33955e5200822ae363dba40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ms/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "48a6762fc270b6666f972d5f5000450741aba4845e7857a8fa609819765f9745fe295b1d491762d39b73e717fde7bd0d9fea24f3b3bd5aece28d82dbad7e10f5"; + sha512 = "1b649a0ef49cdf869ce3836c4ef037882f9b66889af787aae28032b879b0e38ec86ac823276397903ba91c3b640d15644225b0418fe748d94bb1499b0c9409b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/my/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c48c372b20515cee56138313556a4a2156b1316b1586b563e50b5e153f22da7387436563f2869129d7176e2df2f030169789342b1604e48e2185fdddce7bf31a"; + sha512 = "266b5e3e6c6c26bd9c82839716cd2d3eac168ff96960a406f24ffe4d3a9b8e7da72f68ec01df9d13577ac8c9a38354d30babbb3067c4ad6477cb0d63038c669a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nb-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0152559b76592e30e672af3cc333dcca6fc928e6224a96daff3a01dcc404ab9b18600678ea87a59a28ad0366842c025942e672ae7011f777a2ac170cebaa17b4"; + sha512 = "9ed5567c8bd5e8bdc274ce55c03cf609911276b2c33bc58aaafe4f3828dd4d8c32c669337c747b1283ea0fcc7fa6813d9fc06c3b6384c2c1d6911d69456604d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ne-NP/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "aa6226d0f0e1f3550ab4103e583d1a3a38b509ddabceab46ae3a7c02e7403884d08c7084e49b626e2d06581eb6b5192de913f245998f516577521ad0beb43b40"; + sha512 = "f98bb5236d175ee3b40e8cbcf2a92899fde9c35fd1528e6160876f9f541b9de8395af4043be8afbfc4070cd2ae9b1d85a3ef40883051615a6591564f47533776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1cb3f8b0e7634dd978640d0f080086d8fd071180c0266f94db6cfdc1c6d33ee79776b8d2c8bfdbadd2e102a78fc01176a16ad29a101d58c716de800cfc6db42a"; + sha512 = "9af76a903df95d99d20cd9acc28badb1d39c2112844668993bc4ae9158221700ebc115dea198f8fb4afb7db59f6f855c7e1b8fe7ef15888072a4ee1bd6eb61d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nn-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f30751ad1c02ee9fb7f4dd442cbbec9ae217700b6d35b619cbc12e00f58eb25f37fb5c98908dcbe0b82c81f6790c3334265d28c1bc882d0a772cf45c8ac48a33"; + sha512 = "d23038b982bda5a7f636e5ef012d8618072eb188d379d026488695c21698e6ac452340d1719dca89cd0c7487a14271339f36a716ffd08f23b4bf5dbbafc121aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/oc/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1b1c5f822f119f114d8a68d2aa098b398b70c420d4823203694d4491dede84d4d096a652faabbf4905108663da87235bddf1075c4fb54a8017374f01d99da34c"; + sha512 = "cf5e95c8024d827ef3ab242f09d99789b1e074f4982d77ad13ff4f03ca060a4a1c597d9359a01afd20d465fa23605e77fd1ec9dda71159fa34c468cfec4462f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/or/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "285b27aad7065e9bfb75d70662512916f000f5fb11637a34413e4f67043bf35beb3e13960b88b67ce932b2aef879c802a88a0cf19dd7c8d7b89f0303a47c4142"; + sha512 = "ae80ab15d337a5b0f4e7b56f0dafe32689ae5a6bef1a2a3b0dfbb022e12452c5ebf54d39395e67a10daa3d29db7f74e199080a39978960c4b4e5ebcfd2ac762d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pa-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "bca37e2c65a0341a9a695edfc99444b761eddfeae95ee168ea65583c2511864e1cc1070a53fe73392e2a2e091a270123be9a18b09de54f142803674bc2ed4f8f"; + sha512 = "071a1bcf9ae7da98577c561264820b8f31fb81b2778f96a7e5707b175314b0d124b3ab484d057b90eb39897314e80c8ecaf95605f984a355e5c0b73fad9714a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8ce19ac1311fc7305ecdc5304918bec16dfc3d65a7edacdd06494ef7486537f1e1bf139c7dff2b9d16e6b72ab41110de0efe2b39f5b956774d9dca9169006aee"; + sha512 = "2b9c7af72db100e0acd9023855e1ef14aa13972e6a46eac0829831bcdbd6e059c5bf8f75c70f3e4687b243bd60bd9b8617c80cc036021926459092495c294728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-BR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "910a36d7175d576fde413e9749c406c734c33ae15c8fde5129468a76c48cd604491c3be9480bdf768d90d910d4c0c82bcf32a5d92f7c442e42edf07c445f6879"; + sha512 = "6b2efbf5c74352f903035105db81bdf17a3ea2680711d7efd780801215d1f772b3e031162ec296c411dcea63b0b899ac8be51001049b6c4acf607a27a94823b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-PT/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7e4acdabdf73291ca35d20575b7a6d367a9b874310937ac8a5adaaf89328decb85d23aa41c0ed088607387e36a86ea9c79cb51b99e12622422917565d9d6bee2"; + sha512 = "3e666c69a66c5e341140cdf00dbf5e2b13d90af067e79fb242b2e34b2bba3849131cbd408c4822945a516965e4c09c55f2283bf2cd83722d4307f0445e2588d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/rm/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "639b0c0d80fbb3a619565bd86d1ddb7078412c667f37f4758048b444ade16328f79f6c40da3fd644cc8f3290f93ad2c1799a16e952066dd172b46fbae2e6bbb9"; + sha512 = "d46528605791a92de03bd6db6e7cc00b9d6966affc5523266f9baa0750ff052b892e4dcea852cb4c5e6546a5d8cb6a3bc4b01102ee81e12df7030dbdd7d2b9ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ro/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6ff276594b9aa3c5d0459db8cdbd2fb4a78c19fa7bd6a7f6dc1aee0e8e01c2238750f9d923925271f6ad6eb67c3e1fe93c1874fa2a39baece42e5d00c0e1957e"; + sha512 = "8584be2c838c721046fccee9580ff1fd251fa7b0bb0284e8e2f0d65ff1349312de6ebf6072e4782b57d80173f6c526df773c68d0a5f9472baa88394e9cf84c4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ru/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5579599f5013abcc7302a32aca58a2011a319de08f7e24d077496a4b19f9f9a631c839929d33a1a6804caed23c62787e354e71db974f0a3eacd73300b9b803c6"; + sha512 = "150c7ecd29983f9ebde9d85d7ea0cb3dbb552945bb7dc4a90d103207ee868c3809c8ce2a77f5cbb093b9cda913abd70afce78c9547a57bc6321ae8694b1c5874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/si/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b07a113f81af2f53500de22b9cb99989ce2c26b01a26f0d1448efbcce8e7052f53ddc07ceeb638305caacc7fc3a334b06e7eadf34a73a9a7d8bfd95fc22505ca"; + sha512 = "fe49558596b3ed3b8e922145f3d55de6d47854137fb2992769d7a4f1b718e4b6c7c4ccc0f9b99f53d6474111e055947f8f9f52aea248217e207f7ac022746da4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "41cd851dd8d54e0a8cd128b37b4170bd657a1cc9ab1e59080f477e4b0a12f22b37385106892e5f67bc52b6ceec938b05268a723d4cdb801289bd64d18ec8fd75"; + sha512 = "48021f8552165f9ade8779e967469f5d8db761c90aa3535f6f073f9d00de378a991d8705a46e8a8e5071ddfe1ca64915530f131e80028e29b706f6d41c0b7889"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e3db0de96e71579624f3b7b243853fa83adf5abe7cb78306598a5cf03b22d480ab4ad780e71c1d91e1c7a7a1bacd753ebcc4c3e7a33c04c40e0315c943a48bce"; + sha512 = "74c14db1244825e0914c0719e9d8617e760da562600df1eec65ec8853a3a6a2c0516f8286d81933946abb1803f3807fbe21a295442edabf49c174611e440562b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/son/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "eacf707cb6c3da50d0739fe5f26c35c10679d54265b9528ba3cd805621cd304e0d1a58cc7568a6822543283210f86b7fa85074d21702cba173f83e92ac0fcc5b"; + sha512 = "486d10059b08aed3473b0d13bdf2490ac8299fd47295169ac631990d6ea4947859ede13aa86ed201343be9e40ef4e63a40b0a96947ae0f5fc0ab23b666f4b16d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sq/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c164f2ec8af034ba49aee7e4d85bbe5c19721ac3d090cc0f82b2d8a0683f2d5dadc9507bdd23fd0f7b7882151b28ec8f0dfd0cfc293f07bc1ec4bcb5e63dad6a"; + sha512 = "75d6265c3eed948d4b5ea8168a1ba992655be83550f0fd4f3ed1d35e25aeaf09cc168dd2dbc1158e08b99bbdcc3f032e75f1675c35cdd37a683e9fb24248b5df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4893138ff776f85a67d6983de06dbb5dc7b799968ce277b0bee7b3e534836552e9ff82e551b9a013473189e457370036aadb9366e18eb14f124d2b18536f4db4"; + sha512 = "755e742490df25bd5c69a40bcaccb58637684b549092bab195cc524d89747b62d424ee693579cfdb2ab8a125070c3f26cafe3d919290fa9a8e4cc2bb71fd9297"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sv-SE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b612b2c01f072ff4c242fbd91612b0a7d3aeaa6635c0c1a66f4934726a8b8332119f6d96971aa056fa57d091d66fb71192b72bdc943bc788f59bb3a142b58852"; + sha512 = "aa6a119f69e4c4e6ce3d7eb45c3d21019fd3e29fd8d4f3a9fc12e939f230646cccbb1dee54a0528cbecb48db4bed42a1996a0e1757a1d18ff647b5de1b203379"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ta/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4f431d7702f7dba2223084c567284acec2cd741d29db8888ebe8632ab849f3cbe12165ea3cd4d0f725ee24d9383e7e908826da6fa336a3cb68c616a599083e25"; + sha512 = "1b034a6959630fc7f5fd32d4288d43d374338c38371e2357702cf0e1055ea513aadb0dfab819edcb751c98e9bff993d59a571eb86cf493584451ec4e8e66aa03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/te/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "67c89777963c76fe126431521d8b9a80bdf2bec8ea6e6f231840f99099cef0188fd06017bd4f3391aef64c99a8b2f0eace0a3dc466e1d25c82ce4b0783723884"; + sha512 = "294f92edf25d2e89661f25b1fd2b750649c0b6f965ad1fcfeee2cdf61d3781e1ae2a11b6731a77e7fb2ccb399cef5a045d5a707f4a84713cf4b5cf23faa747bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/th/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "736a96e4b772bd34108e173c15f41aab1676352435aa17a333f259733e9924af16226ed1b7d639221e538e8b48c224ff27f0b09a5bde1bd0700d005cfbe20055"; + sha512 = "1d5b15208d4b3d59241d244334328cdda547772aca5de8652bf4710222c9ecbedd590280d2632dacfb6e28e7803556d652da6539688d41d7c8299daa480ae81e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/tr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "34d33d7503948ad26f40ec3c1defb96b962f07b8d9afff569421168d35a8666345abb9c23a0125bd103448ed86bd22e361b716608a42bbac1482035d2fa48ff6"; + sha512 = "c155c13c7a8964dc163214bc6ade3f0966b349766d072d4846f2228b761ac221dca0d79961e8ea5c8afe0a4ebb73e5ec65bc350a3b1a1905ae289ab7f378d88e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f2df840ef644f5ae344c6e88faca3af65c6c24147f5867e87b9c09e8f94f18747ecec7f0d76dbc9e640224988f1924845b820847dee9983769e09fc5b4f47081"; + sha512 = "bd6084b296f308f04708b301dbc46ec7cdf3e95249b3ec8f4f64b129df1e979721f3796cfabaacc56e124312b86dfdbe19161928b8783a731e59f6b29079c12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ur/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4d8f591cc72adcb6cd31b14b11bb47911f1c566e6c66c93f08ef07a5608936aa2bee54a5929e5238a218e8080daea8a4c83c3135b789bad85123abd03cf7a6c4"; + sha512 = "0b3d5447fcfbb3cfab741848fc64f1dcc013bc1a13dbabc880c59721803e62f0dc6605db15b1cd6f9c150085934674d364974f947d37c4c1208e98919a0c4044"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uz/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "86ebc113a76905813795d451d7993be8f1c6f0e9b928d25b5f1e4e651f8e2c2492baa01e00af594d1edbd0948f6173e91a37cc5595f62dd7c82c8b6ffffe25ba"; + sha512 = "b5d91159caa13ed34e51206c3127a29d1b7b7f1e07090eeeb25d21dbce4fbc86cae16dfed9f5f1e8b59ee75e9b15460ed89669501d466b5992a9b731e28ae04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/vi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3278d20cac4b0311e0bb5d0034bd697eebc3ce14ed1099ca04f646e6fe04ed1ee2aae03d118a4cb447ca4c0253b127a275410cbab70bdd671f1e5fda28618cd7"; + sha512 = "9ec16c42df70d29b879d0bf38a0e3173a4c5e5b45231d5a04ea111ab347c91cfebdb68c4fa960710cb37e4ea439d48b843e5823171e3bb094ffcfcc53cd50aca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/xh/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "cd65c0c9abe5d90bebc3eaba01a45fd15cc31d115648fda0c54e662183cea9e41557d629a282620dc0867850e99dbaabfd1c213df6fb839883111602d105d40e"; + sha512 = "b2c5fa48411cd13dcbccdc747ca0d73458e1b067aedb57aba7a2bed66a46cf8e6466d6b7e5e49f919cb30190daef1d82dd60efa9ffa6d80ca63d7d0998c390f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-CN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3cc975c9880c2eba033954c8caf828144ee0002fe4be9df68a9de1bb183001b572515dd063961f998a4a7b4fffcf285568f979ef0d44cd34788dca8b41c5668d"; + sha512 = "90b830a074e653bab78fcfd4863090af1225a99fce271f8427421d2a70ab04d3c58a0ca367530f2e34b52034d662ccc219b53f0c4793b906be4049d23fb91b9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-TW/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2a5a1ae121819be9df3b2d0c95e2676c72f3094a09dce797d23cdd4e9d2326560bde37574d48ec8eeb973c41e07a4ab12d49cf53324c70cac1d2b881ea22a4dd"; + sha512 = "454fbf27e514638892061d78ce85290e66569e411f5f38f49260b7e14704ceb9cf1d8ddbe3bed524b92dab07c06b1a8527e373ad6e2233c6761f672cd3c57a38"; } ]; } From 4d7f23520ea238ff906f1c310ffff8b9d937cc94 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 27 Jun 2018 18:16:37 +0800 Subject: [PATCH 210/312] firefox-beta-bin: 61.0b14 -> 62.0b3 --- .../browsers/firefox-bin/beta_sources.nix | 796 +++++++++--------- 1 file changed, 403 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index feab0194983d..9be83bc3678f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0b14"; + version = "62.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "db3ed2a6baafe609e3e57f21058b65d6aaad657289c647f50cf701de11653324ea02a1edd11ff005a1037b61053cdf332c2399eb5483f31783e44665fa0a5892"; + sha512 = "30ede248dbc0a8d9375d372dd1c0260dbf7fbbb398d1528400933953da56ef018cf7bac604bef1138a5454fde8cbb96906f65b0afe3605dc9ff5edee91245c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b6a1607c92e59e05a17df816e99065b1ecd0d83e8de6f14493985d758c7900d6ca648fb63664479f94d7a162f61a2c3e8dfe54d9ac07a61a1d2021be0d2601ce"; + sha512 = "52227774b4c0f4817c208ca46f68d09fcdd9865867a438ec2eda8dcb66564e7cc7f88d3102dcaa1de6edf428b16167a2460b181facd2b12a2dd0c287deac75e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8a4df389f422a994926875d90b880ff110f4c526f50c6fafef164b4a7657677f05932729c553387e06bef7af7e479e0e357b005fef72ed05c940811ba94f7f9b"; + sha512 = "e932625df7fcdfbd8c30898008ac07aa91c446a3785eb3c7cc0998ed5e52659268bc8b86086968534e8108312dacd53de4d0e5d9cd0bdc2f76edd46c29599bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "349f96b77c0b67e9339079c3d5a3b71a655855b5a2d138e3444f0018043a9ba801830a62c07be2ccc452202ff171802ac46bfee4223f5aaaf623d51430a0fa40"; + sha512 = "1873b5a75b3b51e69143f8b85442a995d05a2b753e5ddc06b15224b34d694f8f3ccfba3d15e522e12a265813255023258b791e0a95c680af1d07771aac196ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "c60cf70bcae7ccc00fe4a0350a60ecde6284d7e4cca96386b2e8fd26d0f45fded354b547c0da2855e20b0150772fa6e4523074f8bc455c11a1a05abdf0680940"; + sha512 = "31b0241902ece8d7364e85a5072f8e4f9ee18fb0b45f3f0d11dff4c25499e6488fa47fbe4eaed6ab16fb63d72fa153e8459ef0e455973d0142e3240ebee35503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c68f45e752a7e0733540ade38e369ab85e0815f81d0df8887509e3ce0265a7f8d213ccec9390a6637600ef2027d413c14933702d259c745cf1e9789f13d2760c"; + sha512 = "d4b3033952e71c3aa9c4a0b6e3835c35795deddee65c0f39f50f24d4b5557407d7bbfb6f7e69969856c1ae4e8d7654e943656377c94dd33d8e45a5ce44054eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b953d077fad90aec862fd50c9cb9ec73b682cbcc1ccefc75e813ce00aeeb7f2865b6abeaa23e1a6217e2fffe4530110447905d5c7d68d6a4a297669ecf98a7b5"; + sha512 = "8bb472d6f3a81db37b5d3e06f19b1c7a3c44f7055ccbc922a600b10870f45e2380ea427cd7e0a3b4567798a21274f9619482e077650a22f2bcd7d52c8d83a06f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d68b380e95e3c353698b5e6842aee7737c22d1140d62d92653936efb92b49ec1e9f227ad9e0cd8cb5dbdbc5efd7b537112532a87c4d20759adc89d9ae58a42c7"; + sha512 = "4c5e859878a9463d9c55b08b1a1ef41d09265bfb4b217cfb3c70ee98f6df50910493a5425fcbff0473ca9c29a8ff753097530d7747506747b4ac05f2b9e87f39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "79270f024baaacbc01b46d63c60ed58e75f49c1ec14a0c9de480bfd750b5f914bbaf25be216792bf0be6eaa3ae0f8886862bdb8f92568eef54c6f31b9f71c15a"; + sha512 = "95eb87c22eeb1302cd86c4a92ffdd367d3586eb9ad6a6472a4b7cb8133554f09f322572d576c46a23d0b0a6fd9f84fd2b7217ada82eeedaeb31484c8d85e6807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3c5620c1017dae764823fc98cb724e69fa74bb0925fe1ee1f687de7122d3a9094492d7fc80fcf3e922c7bdd3d6bd4e744bd9cf02f3f10763382303f88fb79b48"; + sha512 = "629ecff0efa7aad6f6ce407f1d44ac5c52f781828909a953ad6efe92c43c1cb94fb555bf96e2474b664bdeefaf40b1f6ed7e0acbc43ab9e48ee37b5d0164908c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "47a9f5c4b6f9e96b8c6dd64fd3989115a66a5ced77c913409201f4dae25c6d72b6d91e0746abcaaafc4c84d3018d7955e085dd2af45665b96f590a95746e8da1"; + sha512 = "ae7a67643bcaaaa199560785169c41f43854ef0ca110e1fffcd7f118433e6213bb4549fb6c85b52a3c1b00a7700609f489eb7e649225f4f3f1aeab0097af82e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "75fbd163865f92bc40eff88d475b8e30e77e4e9a3d1d9b0ba588e7b78d5ca1c57d15d85cd8868dda73e8a67a25e0ecfbc9710d758828463b0d7030076c3d421d"; + sha512 = "eaffdb43d8870a26989be3f3ac44649a593c40679f2d7ff230fd710f3edd2fd9d011503e9a7e4659a4db5acc9eddb979c9bc9c6953d3f089c278e145e2a89eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "23065f2645d8ee5c502568bac03f7e184b7d49d9c05388d2110e9875ac7423c43f3edef6c64d307c14697991adc039d6779fcc8c6b4f488b953484e611e0931f"; + sha512 = "b431d7b07bad19fb209ce8563cbac95f2385b921f13bbc931deaa37528850d7234734a223775796c7d919e67931ac4d931345badebdf158f3d9de20b7267dac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "10c180075ebdb9eeb09f00e8c3c88848955969b429167a3dc2f8a61826ea20aa687cc2ed819ad0a8d59909278e55c2c8c626bf0a366ec52841e27b0eb434d3d7"; + sha512 = "04b5aaf8c9e29f85cb5c8a71a1bd6c43e0247f3c92bfb56bd3c0b862ec813c5d94dd40ae901609516a12649beeaac7d7e512b585d1e9b5e87167329942b614e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9dc714c03556dcaf0d775257183a93b09b1bda567fce442af55e7dca4fbd119ca55d754c1d504304683e92bd29734b298ba685a089b11ceab52cee5ebbc74fc3"; + sha512 = "80680ed074f4f532bf5138174bc7f79b1f0dac4617e717e52dea3ceb6592919776ba7afcfc8b63d9dae8816d0dfde8af7badecf6f84610404f94c5a92486abf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a4122dfca825a16a40176a6aba334e4fc74e66146f04d01812c6049be2ff93b0199f321bd2d46b02b87a179fb51ae95246fde58a263e507ff2f3fe1b1e11d3dc"; + sha512 = "d93cd8788dffaa1f58ea70454d2b5693d0b22bbd8f8d65456add235c6ce812faa04e63ee375b07154f8a0d6364df39637b43bb7e7619eae2df394c9e8724eeb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5fd2a5f5bf3d26c79eb896370932c5bc72842f086617fe16a8b4b729c841a8e872946b56e20c623b54c12a6751918c3cd97d7dc29835b0b2a04a01f70da65e38"; + sha512 = "2a3a4f1d31dc97655b2a0dab87d21c71b974545be1d35c427f459cc079b32d91da65ede482c9915d333d865266a1a2ed6dfa0ab770943972a91064f08bfca67b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a9f48d240cc0bb8eacf2ab418b5903db0d789c3712a61b28b8aee3aec2c9112eb79a4805142798aa15561ab09d7d63fb69ddced7d8ae3b1fd5aab1f00da164e2"; + sha512 = "529aa1487c7cd7e488fdf8e011acb0284b2d9d2c89cbcf4799f530fc9301f4894eaea555939896d289a63cbe737e0dbc5b1312dab6a2684213cf33ee988799d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ca81b151a407d588418505b84cfa14cea622d50c3ce3cf7e8b9e0666fc5c93d7f2fd25e792d768ea8d7fbbbc22d7228a2bd85fcafd9aafc6c8f8c78259e6e9ad"; + sha512 = "160a7ef01b28c72b66ba07c9d3cb7bf8acd8935ed2a3e17d14bf62385e46f19b6e8d24cf4f3b98e321183a17bd7f6d6ee75bc144244f66f93d1b3945cfe9ad1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f4a733fc705ddb33f8f2108c85aa39050157fdcfc9ae07905ce6fd50e910595741837356eaefe83610a50e4ac93b919ce8d665817b5b53f9c71cb00c278b73f9"; + sha512 = "c0f3095ad12bc6f9131f676d17dca3385b586c593f0de8568c3b7dbb1c6ca43729720b962f35d5993be0fdef096da5085ab64d4868f29727d49a136955abe086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "da642365a096f146047b92d915467b34cb348fe1986189afdd32e0fb5a89d826b9d19c5f0adbc786810d65987528a7d7c4fef60ba144e695ffff26e2149b099e"; + sha512 = "e899b6aeafab429521cf25de489d98fad392a901c5533185b7b2e7516b6705f13a57c6bb68b5904a0887c54a026959df2b0fb1375df3a926b3065d516bdc0f4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "ccdb6270c83ca3475a4a77d3bc9304c1407977d0c60a4cee9680122b8e16a481f656914174cd6e4ea9b9a738424c74eecc34c864f897bfb2b59736d9cbe7a8ab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "aaec5a485464ab420d936395c16dbea142642162b22a494a5ebe5ac6e9f184df303807fda2573d7f36cd0cfa370f7b6101b4bbd259ff59f16f99bc88039c253b"; + sha512 = "674854163f9ede8b6e4eab70b748635e0111420c127a9b94ead1294330255f4f00c89160608b98dc6231114bf4be87aa470631645069ac5a587f84a282ca6656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "61e810f7c8d3d959f29653e754ec4d1b3f5745684c06d2621a9c84da70917adf4a6926f16288ac3375240247c9d09388be0c07cf386f4683f4ae4dc967eb53a2"; + sha512 = "b09b00a8a5228fc2afb0d890ec63a19a078cdfbf82c64b7255aa26ed5ec26591b2dbc4e313bff40fab0accd6ecdaa4fbbce363bb78fed5d29d4fb7b7e46713ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b8feaa4158cc886799eacfd87a28f48d1176e5e23d89d7f23457197ae9c8a414a45f96a656815d3322ba307d20cac889f68984967114a7e5655276a32a10ad71"; + sha512 = "72be1014c8be0030cd0c512c31c64a73957d24eb756bf4cc9959a5656f460ecbae5c984d0708cb9d5d29c434468f7b68bb215d04bc261057921bfcc75bb420c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ad3293e8b836ad2b0fe81f4864d8b9ea3a62fb2e293c564fd92a67d75671047c8b2f77ca9626dbc6bd5f4f4989b43d676eb8f56e2ea7bb7770a682b583a3d889"; + sha512 = "65fd6961a1f694711336bbab7f1cf1ca5804f838295a9e3d4ead6c7fee7779c7c881820bf35eb8de218e08b8435329514a43e9018253f5519856fc0a75382d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "437a6d1f79e45f0ffade6db41806d2397fa85966e744bab1251ad38c77141782ac2c7e97303ce75013f17d2be7672121c366a35de00b12a42e3eb382b56323ab"; + sha512 = "a1b23e9591635e0f4bf8520e63cbc7e7ee8c9b016983b4e71185f067deaf2f1edeca80798ac833fd0aa2f337fcce71ebb36fec7afb30f9a36bdf0b59162ffef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "685f731b6d24c9c7d069e3bd1e387ca68e6c165c0f68aa956b644ef68bb5094be93ed4c97e1e102da7b1773083ea578a7aa12fa8f3b56d7e28c79e0503952043"; + sha512 = "ed19154cc73ba0115a5f3b5606661324992d09347fc4debea0174d49ce01ed6aa4d7a1db51a064d4190053ef20f3d1263f8c48125075178a41da80ab4870e7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c01478c08a969ad80a2fb3be6f0a64e483100e4bdaf2d287e1cc410c0ed4b7ce7845fb1a3ed7cd393cecddd094b2eaacfb8a59101da0f6ae69f50817f1163b83"; + sha512 = "b6ce87d1adde83a33bddf2c26051facfee52197fdc8e1f9d3e457b05dee15ff76c36e0987d4802a68717ffbbdb3cb22d7737fe76d0b4b19be9b818c2d319ea8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0cca13347ce96fd516658a25ebb4c6c9c3bab292d7bfaf9fd5f0b046af5171c9b628808d118fcf32c0ec7b5c5a1a3d38f0c39c652436c42f700b7ec02d888752"; + sha512 = "286c1b3cee8b93496b2ea1c158af19a5dc8f8094c5656ca3062463783834590199a2ce20e31141be2de9772b2e5d2a16ec52ad46fd19fadd25ae5c828f0b3b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "51542b5b23f34d6fed183a5fb764d3904fba9c2e64f5818ecd6cf06b903b8b77f65365d0c38648ff454a46fa557744f6a62c520428909a3dd6a69440fbb2fc86"; + sha512 = "d99ffaf22ad6040382d4501572591f5a5f507baa812ff51911d7d7df876a22c961eedd2570eca9efa2a9109ab48e8b17b54838e90ef1b8bd619a0b3f57cef239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "24e6bc43548588f7e4ab2b9ffbf2631924abb2e4878bc1f34fd0f03ab82d5eb2cc923de2473a7887579fb4089ff7370470fb4f4d6141e5695fa90447e43320f9"; + sha512 = "0ccfe1605789438672104bf54325676c1fdf2cafb3a3698eacfc9844843d8d33e1dee11fa38934c625301a5ce1f3ee271c2587d39aa64abc9efa509549d897df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "128ae166b160bcb909d46ce491edc3a916b09040ca13e032d87fb324031410696f610dfde2e179337278388a04a2b9dfaf66dc665c8006838e4dae8adaeb9729"; + sha512 = "7114be05fc7418f4426e6b61e2dc6b3629b905117af1517004a68eda17f6bdd0818c656efc5c298e2a2b357c740d2410e96022aa0c1d964ef83bda48b2c55d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "df4d1662be15fa20eda2211250b0f67b4397b4ba6f405920356aabcb4faf41d78bbadeab174d4d4bf34059aece1138b430420fc03fe6105b2864c1a020545736"; + sha512 = "74eeccf7d25e71482d1a0b96096559aa90d969aff0e5085f7c0f51fbb6cd6b7bb9689e648f89ca5773efcd9ec51ed493baa49d007a10163a8995c3738573d880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4a8b8cabc19ab53bc510b9cbbda9af78abd688f8ca59ee4ede1c2452f3813c9b662bda41325e5bd181ee82777cae605fe00d2da6d41237dd967b7b0a0ab7abd1"; + sha512 = "30df120ccd5fbd0970851694edd0f09058a02bcf7e22928869f779b2ab4f31886b5893379bb742f67cba3427a368c5413354ac49d89cbcd6ed0e7a5d15941792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "33cc81bd2ad138ecec1b8f34eb2ea9c54d7e1180ff4ecc7c569f8d1984c8651c0b13d5648dc11ce4cf8b54898a801c5b8f7b4129e342916e757907e820e6eb68"; + sha512 = "7ccb92068898d13494047de74e4663b87e2567a8ba252d53d5ca7b395053d5488524aeb035db2c01b25eb4320c79f5628da7faccf57d9c9e076921bfdf4bf84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b2d0d5ead80040c9ffa393568896792a092fffd9b65713a49d06411bd087e5226ccab8cfbf739d209a6abf1db33b7b051d661e88d20809e63fb8217bf2561e8f"; + sha512 = "d2c468239240c860324733dfda2aa3b94864e31d83079ff3026c7abbb2949c891da4a72fe7ae4509d9f3e88d3805201f200c1dd6ac0169c4206bf651977b5ad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "af2cdabb5bad6fae6fee620dfcb4f0cb2092ed1ec2630ba625575e4001e4f9632e7273e1f0397d3451053cd7861daa09e07946a360a9b22b94172ef2fdd9a805"; + sha512 = "a4646dfa1761ec80139ab38106bb823b90170dacd851a5406a675d4b388391da01faf2211ae5913ccbf0b0207c2af6c166f12bdc51185a2c97de1d7fbac1e262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "70273bd17930f0d6062bcbb83a9a62137df4fdd6cdcdc6d924765667ef324dd6b240980db6909fd07622dad50a6aa722d0b209c7b1549df254f9b18dccaa5c69"; + sha512 = "6caf34ec1b45abe91ccb48d09d4462c5b3dd6bb1f42a727805b7348b5d027f5b7128661979e9f711ef93c55f36abb082d7ae38961d1333bbc0422047e0ec05a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f55b0ff1ee18d9cad4008ad8f3934274e27bc47b96d052504fb0a81777bccff7ab70b9577efe0b1e020c45d52600d2c83f63eca4d847af9a76906453f007250b"; + sha512 = "b8193b7b4123635a7df3c7fc89afbafbca04f29789bb8165f32f91afbac91255d9f157e320ef34775ba8aef9de6c05c556de8ba0f8a108601cd75b1d2d8ff7b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a019bc5261681a56fc4cd0c69269c2a0b64ab59b7e3b2fc8bc1f93258abcd883eb27fd54af3128cfeede247d3af83454ff7fe28b07c61294850c0ac09c730898"; + sha512 = "a8d3614e837c3c62c7eda24dfcb8347240b3e8d23282c9dc02a62ffc2bf84ec97602288f9459e05fbb364e4ab196099e7a4e881f8c39211b027c64a8baf1ecd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "08acda8d3412f713c9ab352a650e3bb03e880ceca90a9160bae712d67bffccfdd448ff6efbe5da0ae798c542fe3e8cdb960d45dcdbfc5ce8e76204ad243f8aae"; + sha512 = "953acf6c1f65c7e5ad67dc3c8f0f2e8cf764aa230b8a1391221ab1966dbdc45c0199cd4d8e11b2409ec1a964a14c468a2bc4a517ec1597578f02301b60965768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a440032a4a9844bc419fdfe53dda3ed9df9e4323ccef56c3d346c84abcd0262b2d8b777892560d14e831b348c1e958fc309c4740280fec94f9ef0be56751b939"; + sha512 = "0a4364e10a169fa755cd04ad205fa9fea01c8197a299c0c8a6857861343b6cf154bbe9b615c7592823cdf5a05043d97974d61867db63b4d4971fd28ddafe6c85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "fda2da9cd5ee20becf3f43af75eb9a101b986911921ef0b31b8350945d06fb5c8f6e86b4fe863021564a0e03e8e3b66bce2c4dbb5adb4a060140f47008e20a5f"; + sha512 = "7ca2d592ff66147387cbdd651addc07f05fa8f7def67200f7b6e8b5d7b71874eeb2f289ae5e8a91f321c90e2216a7ed2accba1f45bdb40bbf5f115509ae0a660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "beaa980e41ccda8da17afabb1e9628400087930581c6aa53f84cde1849b9395cf55b2a8d0f99514df93e439de8b0b65b75e767bb72ade0dbc26265392410befb"; + sha512 = "a3f9f110b344e6c5e204b2d5439594ea2a38db591693be6a357ae145864e4f2f989e876fcf947ae4ddb897c32d3f376931075a0b56e0034b4f558eed8d6293f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "abfb497cb396855188222b4fda3f529ece63df9314540db2d8f998588150c036ca44f9e5a1b0b28ec1e49c0bc2ff16617cd41b8e427a8cf80df07199a5cad794"; + sha512 = "816e5aaa60e9041f127a5792e44357245a551feef2415d6c1d1e3e5045629382be7cad0cb9947c666cde0010ff93e4c114a0b04e0e060ed508b5c280456e118e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7a7f0ac492b52f4dd85f9cdbcead46957dd866a10abb92abd5e0ead7a6b3a28cc3fdb4d7f35b3074bea867342977713cb5fb3e75fc35225b4fd915831c3b7b11"; + sha512 = "5cb7979744039864ec9451db0d4f8771792df35be22171a2d1934533f751aa3269fde7dcd6bb263284a2e66c83823f6b36c821e92aed7804c2b091c23c6abd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5ca423c446b7923d609e5ea831ff8d732f58326e5a04d42da546418963a18568c48af608ba15c2c64d4a91a7e8baae8c911349dd8b6153d55d03252e95e5fdb0"; + sha512 = "971051896b26735f0e94ec60bc046900c62cad571b1d6daf4c41c65d825056ae72c5fc4428c696cc148ad107050685471cd99887251c52223a46f3cff9347c4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7210c9c50d0486ebbb02b9fa0f82b1f49ca6b30c1159c7bbda16ba25e6ba200892c8fa63ca329a450441d86a1480f79d514172d17a9e4baaf0d336a5a7cca136"; + sha512 = "086733f47febb78bdcf1dff692a3ba03c3de57a03d84245cf8add743f7006f75f9fd1813d6bedab9c71bfe5b2d8d7e2f79950e19cca9a1082664e08f8f3ecd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "4d49c7501c4a1169cd8820e3ba469b9118a1ebba2a72761137c890e4aa1f30ca735cae23c857af3cb9755c69828bb8f4cd51dcd3b862cce39e56d1a4c937d2f1"; + sha512 = "fce9a1a60caef1f77572fee5934d072e9321ff0d6146745da4c48f5461a3e7e74e756ac4e6ebaf1bad804b6e6062eed2d8511377693b459ea8d47a80a99940e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2983b2e1ef94b551ad40558bc0380347aa4b5aaa7964e5d3b2a8de8aa14cbbd472c1abf2ffa1bdec5c2471f6d906395383be9653b5aed1f9d2732e62d04a37d8"; + sha512 = "82480e44a7402deba55cd1bf3112a9c90ef937da3f5c41a4340b8097035e0b7583d8927b73b28433768f7f40e2010704b51e895a703ba40b6ebe1ce106b56946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "edbb9dbda1ad0e7a1b7f0f9c79001052083a36b180706a26ff70653ee4af859f0d93a5792a59f2542cad140005c8cdf2948cf8b4a784626ee78b009f2a92d3a9"; + sha512 = "ecb4cb08e7638478281522346181af2ad939567e777f9b49bbac54985f0d01a98260a3a36ee9053d0cb8e549a3aee481d2639d87eced7fdfd31693c88675bfd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "63d8787831be6a56e7a1ef73c1d54c5e2659415862e87c7f0e237c9b83a9dc7a41259fa598f9ad49af1608ef7d49fa46c8b3c0395f9ff473567a16620523b4f3"; + sha512 = "0cc094cde71d8729a93d3ffeaa8f1ce0e878835133dd32de8a807caea71e06fbc6f41ee748135eebad3fe9241628d6d17628e8a2e68f5e8e4a18e88b31f0fd6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2d47a3853a46609208c07dc79f44cd36e01668f0bdeb37d4dd233fdb2e1388ab545373a52b321b29a86390015af92cf95b0ecf8afeb779fd5a4991b368399d11"; + sha512 = "ba98c0d5270f7d16bb865212a4602bc0baaf0d956e5ffd4cb6f83e67391df450e187a7b927d99e6b4668e5465be0b9839099ea9eb7c67765ab0db2d3d72c6f91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ee009619b6c01e2d85afeda2be4773442ee3e8a037519f6203d6717cf851ad80c3f9622ce9166c4391803870a900b8a9f1f9cefd72fc26549c3712ac91fbdebc"; + sha512 = "3553d3dd634693226bfc0db1aaf94c3c9b43461ab2c4466a8419e4429dc2f8cc87f25d15fe23a588ed1f415944a7019a9686b7bfd3057e6687ce56b63f674236"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ca42d739e7f0611ac4386d71b838e1e02f1f3faf490d4776c6d4efe18bef1abfbe8840c750f2924948b5c4fedbc4b8ddc814ba47d76109c337c237c34484877c"; + sha512 = "79d9097b7b000d95bf967aeca33d043227155e2acf10aa2812af1ada20547e37ca33975ba922b267ae9ed35c107eb466edf6a188d2c87d847828db66df4ad012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "048270e2ce3f5677fd419f7a17896f1d5d5b9169edbc3121aeb4883b1fb6aa945c98f66099cc800d2364cd4510323bd6ee7cd428299a8545a6e43e90c9889a42"; + sha512 = "ebf3264bf56422e8bff7170eca01909ffc197704d386d0fd08847b7dda0b832a4e9e42ef200a7e516b037e6ef02364a5fbfb844faf1dc65c2e99e55cf5d89c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "589ae46f4172da22d479edf47e8593d142a8a194258215d72b657b681122cc500bdf6a10915b5dc3436a897ed033b29ef77e53ed82c42018dd2a23bc40c6e16f"; + sha512 = "37859cc2086c393f0026d5b164ce1a8ae7f43f231f92a94bca3c5d33781a502b1c108b9773745689bc6c7ea17311ccc9b692ef7cbedeb09abf8c8914a4bfdadb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1b1b9cc7a0beaa0eff417e2736da000a0a82f400f1e16181d07943f3740978c491dcb4be2c3f9113c7bd7bfb1ebd5f2dd812ce4e793225e5753c88447d366111"; + sha512 = "f2032095748d301b1c1a7503d80f92f96bb07dbc7373a2b07e879850a706615eb82a838bb2a0617ba3ea779165256bdb2be24f5186073009d52123609310f9da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0aa1d8dda8a60de3f16ca5d600df4e1d3a6f0424ccbfd2f0d89f0f4dec7547e1ac6234e0b75f43785d4ec99a79c96023cdeb8d38fd5632a470382d25d052fd7"; + sha512 = "50e742da88e94d29ef02d172ee9de5ccf78e51997bf9bae048a1c63f703f1af4948cd1b70740a5d8d944fff58bea03c6b66edbb75732fe0817bac89d238203b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7e940801759c6f93892d6fb9839138a6f548563d91ed56b6e4c757523e446e16fc7e6672a1d1fff8b3ebb8c014283a62205ae0528e69228cfc50be88df450b81"; + sha512 = "bd34739a3f1c7722d8532d3c960af7d1abc1150b75d97188551ad4d811b60fd585143e2c2828786a84138753443bb29d480ab342a5bdc843be1d8772641d2243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e8eb6bef0b1acc94d5570a89ff7a9528777f8b6b3eb2ce20984ba299f32c122090d4117b702004ea97e667b38a59d553777a5239b2cf03909501a6c2ca0cb90"; + sha512 = "3accceec24b52c19bab59f0b99e1bbd5ac51553056cbd3a304d0e38fba0c94aa927d3f4ddcf709996a819be64f0eeb30127c59c0f8b7a2a142e8e37b6d386675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "29df14e1c1529fb5e69925e58dba1ee093c3f1279499e28ca0477511c62f838b8e2b76218b2a32f3a7012dc246b9bd41a8ebab691c986fae1e0aeebf80deae98"; + sha512 = "614cd2818a1868667d17576b793c471dbccf1afe450a1dbda969aa4c84fe67dc44108fcaa2146ca64a0f5109201e4efcbb65dbf49ae68b900f57138a2a562ece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7e5054e4daf8b03851c68a9453d43f5991e1f06b27483ec2c788460134aa196630d1f7e3ca2e6be3aefe1b04ea02ab9d765d6c92f3baeef48f463b14308367f6"; + sha512 = "85068377c4a31e96c85efeab9019830bd4703bd3a26ba8a9d5c52e3c8c3fda4c23efef0a9c5a97c17fa0cc7a4f982024bd7fa0eeb0a80eb05ec90d22f610859f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7627427e8f2650caf48ce0c319d5adeddba8f12b8a7869481954f7b66fdfeb0cbf7dc4248a2164ebdecc136d078db376cabbdec26999220f0bc604cd779c5393"; + sha512 = "88f09504637268604a77b59b61f0fbd38fe3f4a04d557c7e2abb36d5c2bdff88d1c6fc07ca1cc18e00a4a032de4e93fb674552d9ab77d3ad2256dba45438cce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b84b177ef37cb0760ecb717597175923110732ef87043efc7c751705fb0317fe585112e66c1350b552dd1b338d298d59f32c18f426d943e9e1d5d95996aac056"; + sha512 = "97f39a0b777d7bfc90b744e9487cfd7552802978247b0285577bc10f27383d5033f7a3555c399939182dae046e716b35f542b50f7d1e39f7cb78bfa9afd184ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "724e176e62efebb8ca7fefba8a152e4a54269793e077fc8236da49f86bc943a5decb79b1db8fe48b9e4b62470248f6d8bfb33275e8fad5d1ae12be965b35d95b"; + sha512 = "ce9cbecf5ec72ba7843426fab4c62e0ace1d0870816e00b104e60f7ee7300111d2f6759d3f52c128e0c06a912fb22ee0e7db74e185d1ca33451739c703520a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2811005715196c3320a9939db86eb282359ff8fecd7e16097d64cf7a02a8647922db16be214cfef0f7b5b1f7340306b83622ae79e3bc361c19071cd1ecf44762"; + sha512 = "8b52d27861a1a48fb5dce225f88cd7b7104443de0fca537c060225ee0bc5205be40677a8743900eaab892996e2f1fd829865962ad22f72a1dcaa157bfc8b0499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "20569fea1ad722a88f32e4f711fd14020613bd0b17e068962dacf8c789da643ff95b03e67db99496bb3c78c9960e05bfe4c5d4d7e56315f3c5d68b7b52b073a0"; + sha512 = "d8da0175bf389c1d85534b1f8b2fa3acaba0d7f42c4b31c19c1099dda1ad505af1921c9c0009b219a78e6f929978be77eb73ad399dd67e9ccf143339862f4923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "77fc1f141dc0f594bc6c81d48e82cb294ac12bf75e0aa44a0c6302952701b7ad9db637f818042efadc962a0ea86eb54d76a75a2d862eec753960309aeaf58449"; + sha512 = "9a7c68be248103fa7f817d63169f362c0a74de4e3214cd20dd51e0d2b9f0997dad9e71fe4f4cfa908486013c010ccf018e68b26f45f4725cf7c6c6d0f6f51707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "fc59c15e8061aa38fc9192c9d527c70cf645b27bd12fcb4dab9b6b6eca52399670d2ddb734079211b7fc0ae460742c9fa0f05e84cd1cf0c7c4cba2b90161a835"; + sha512 = "a39ba40d3d17bfe4c8ec26e1a727255b3c6d1e4dd1d18f0af473fed1d5955849d035ee1b51969e21e9b20d04a1341f6cc3f0cec02cbe3358cf7f5225ea773ea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fdc761fe1ff141c822ae33c973e43f6746af10c87438929878c95617dcafe15b53b2e5dbfc86f4705b1d2b19de22d9ff001dbe4cfc18690e15a16fa232035890"; + sha512 = "2bf0dc2ae462d160fbaa3cc0351dac577537649adeabd321b44aedda65c4525382dd8627b925ccfc4701966c593dad81b30391819affc15f62481eb93fc46e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3b027dad30e088e7f829cf71d7b9202293c4541719f5f424444542fdbc2b726b8c89f2ec0b4bb44110433cd58c4c1a449816aef97c7a94e985df4867959b978d"; + sha512 = "e63393b51019891b1662f6b5950efd62e7880b9f1921abf35fbcb851cce68d544069a0bf06ffc297c198d216ba7a407165bbd7c127578f6da8a1a173cd5d06a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "073ed117f3fee3a27191083f5b0ad5da554c7e88e9af962ca9fac2a7e51ea852f782812cc5f8dbd4f3ed0a0baa858b0df94a0bc52b5066441d031599d814756e"; + sha512 = "7acc56b02539257d5f08605dd9fa64c01ad4ddbfcae34d81e805f7e46dc311105a43ad102cf588fe332d70d79558119c17d69e653b5bf11eca2d63863725b936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "88c674c508f99b3efd900b8c02cc43a8d10555ff3862ce82ed031ab4f9b05588b62f0591c41f7e617fee8ba8d58a57159417f59e81127d36471d33e2acff1a07"; + sha512 = "f4dbf55b3861e2018412ef3d27d06d531ebd59b1dc0d4b60161f006e920ddcb4cb0ff3bbca7ad2559f3052003044b5bf4370af1d0cf9f2375869f68673dbd102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3a6da575e3dc776a4f5ff94ef8ec3650b5089dbb3f9f413c5656cfd5ef583053db24ff9d51564f46ed69977549fa1c46d838c360d8a56c308c70573d0d2e6b08"; + sha512 = "2c4cb6f9c190a0b286ca9657c29e9bc7065809b5a532c5da906d66095430b01c5b401551eaf3f29fdd5beb44dcdde9de26c9df5fd7acc78474db1509c25f063a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8037bf07ae7d69fa90f1c0bfc0d5ebceab92739e4789c002520da6349fb454d0a365fdb8614e02cc125cddf9f1a2c154d75d9cd4c6ebd0e93b67e9f4f6a54949"; + sha512 = "5dff06cbf8da6a5006ec927adc192f6afdbebd816ff49e2b68036f52fdbe26542da66370a1a574cfb33949a9aa5e18f0f9f4ef5358fbbd65608ea68f9507cc62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "3f7795c2aad51c8650fe48e1722e064acc9d7f021ae03d512f6c339810f635ac2daa0d015f5b1e05e0caa6ff7ae8d5b54bfa0d952f2ace93cc318c77fb4eeb0f"; + sha512 = "e3ab34d448e7a5408461a6663c621da74145381fc25e1db98ac3989b383e093ee2fa1b12429d5d1ece58bc27a3b2a94cefe0fce22e79b8d74116cff637de125a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8e269a4688a81db4b31e01a9cc740d16b8e5b1b8f2d63a869ef9a365e5043a7b6ca6b47457ee263d5f95e148f7c91279435109728bdfe92992525beb450b20d1"; + sha512 = "f8355c83a7af21259a2be8d720cf2cb00bfddd06d699d888da41cdd7a8fc5834833992787f75319193b0cdf7f0b5c87f7b8705bf88de3a5ea357a719cfd58886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b6a93a86cf055da00edb0f8cd77ad2abaa5db584ae6a8ae0165a4bcdec9e36a94ce89094c9aed956c751555518a1d8c92b396fe3f813e9c39605d23aab064b6e"; + sha512 = "daca4090ea994c8111098d874b77e1ed8c8874a993c2c81328081fc42111c476e3a5eda2e383bec557b4bf2e9ac6cb8a78bb75c930cae69d760f231f7bbbda35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4b1204d979afd4269c9e6b2bf91d0e911cbdb4151331bcad1f87cda9f4b72d57f9fdf3bef1aad3f7ef225c2f57093c23120f1f03f8a43ce05da9d777098d1c02"; + sha512 = "c1f6c877b1119b2d16960cd5724ac9044912524791dc25658a86b34f1b1ee800dea524e954e60048fe8211285f227a864359902562a0a721ec6b948fa722da02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7526e31f043c440317b31c4bfac03ed04c52395722b08fb2640e0345f08b36e4004f59cf99af192dcf2604ead3dc39ffd3e54552e7664bfd853c3741c0d9d250"; + sha512 = "0784b64e92df8b00d48695e627a00c3d4bd4ca56f717f0582c4f2fe025f3da9984d6b509fa4ecd06b9367ec6a9931938e69f6edd83397f0ff416e74167d85d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9110f9d05de1700bb1f8b25f551694621180dceb01f2d31c420b80a1f9934abad01c455b3a742df9cd1e2a23bfb6918a428fdabdbf175011e5192df3a4678002"; + sha512 = "76b6412df2dad10607b201d7be480e436e44988d401a055669e2ae308c0d687ead9e3f1bd06d30ccfab55fcff2f605fe96f98e3df8e321bd4ab11a3d211a5ce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2ffee69bf2162d825103be8d5c1886336903e51bc2276b7a8e1724c87b216d6eeb86c36c58dffd3ce543bd6efbc85011c6b5270742f68dcec13bd9e1c68e2792"; + sha512 = "056b78321432303d6dd09f4833b6420f0134a47b90d62820f7bf12b430f608be3cb3d3960bc6e7b4d247c599efbd7305989ca44b55bdaba37c49ef57ce19cf0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "04b16e9ba37f2d318c00f62a02b6aa163cf0f53d6c094f77e9723267595dc1ff7e49270537cfc052016592e036d4c3d6b163865ebb836b61497926fc5c4de0c2"; + sha512 = "f7b5b82969e199a12887f381f39def4d2ab8cf6fb9a722b3b9c312c841dc5fa8b4568e98940d0b683a9165edbdabfcf17092497c80b732108d0883a1ec58bfda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "087fc35a1ecdf796a3b028c2cb2a01e0bfa635a1ef185778901f0cf32f350de9194f3bef9c7f071efff2a99b18abec715a7d46982e1ace1738ed96ec8b59bcf2"; + sha512 = "2a8f683b0529596c35cd0f76b7d8fc1f1503f1298ff05a7596972d3ece439d88587b250615f5994dc75fd1ceb370ef2473f91028015b2464ef259838cd9d78be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "356b1b95f0fb94d549de1d70f9cb7367d939d9bf5c5c261e82abc552897291beb2aed4951fab3790de8aff7a607612a254c2893696283fa9c4c876785519ebbd"; + sha512 = "b33187d6b6b20023fa810a0b3c70792f1c665833213460dbb081c5b2848217a025688b456e66e50d8750e42cb7e71f6445e5680e5d8d7b77c3999463ffbcfbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d08b88fd20cc744e65f860e4e5554464ffc68ad560e9df21e7f9cc50a247ecdde98b14423a77de27d82c5423036fc453f868120acf2f5be1ab256995921a2271"; + sha512 = "ea2b99d16d891e742697a68749cb8499c0457e15e42d61bfe0f2356f3f42ba272df6fe88088a594c9423d59177f4bbbf11dd929d6f33459a280948ecff55a2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "16dfdef8941dbbda1cb56731dd25970b7460168abcc5ee3ef037efbcc0b0b6f3bd37a3f5ea81c6f9c75121dbc6ea95fa100d980ccc9152c05dde2a69f04fa94f"; + sha512 = "fdcfdaba2ef1cda3f7434aea3d7931a9f88b4406ae8a05d5fd1b84722b2170079385f99bb071febfb6416e147f0b06bd0dd710766222edaa5e68331d92edf106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3362d040253ab49a114b534d246a0bf158f0bb37643e2420bd04430c7b0b40a9d416af6b40d907011757b099967a1af841ea97a04b8f2f7d26e3b429c9dbabbf"; + sha512 = "b4e55cd67c66362d28867f9ddef1f6a44d3081e183fb19d4a73895817a37e2eec0a87e394c0fa70305f7752c40ed355ed16fc3111d72e70f6e667b959bf22c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ea53e69b2010801200f7c93f5691a95c1e21ae1ac7f8f5519c64d1e823ec0be097d9298492c68ba970527fb2a8022b9786c0e001c938bfdad803c4b12c65371c"; + sha512 = "20780e1eafed9667b1124a3e99636fe3b401f8da0785c9f44bf5b797b2d7b0ee17cefa916c5a30813bf66fd6bfaa1313d74b8b59e65c05d6488d30aa9939d3cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6d7cf398e05e5e7de2d5262e8fc15482c97ed529807bdf72cbba2f09e95c961c33e4cc4eff5e27f05ed62d3fa4aa2f29803dfdd70ee21271c22880dc5ad380f4"; + sha512 = "bc3cd8e37a59f599b486c966097f152836e1486925fc99f7b65df33535d99347659dea5c0696c061d36a5fe85a8ac307fc43c3b88152daef40389395ca3a43d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e5638cefc2d867edbd1a8c09f756d206b0bd390bb1dc23fe779171c37c73de9fa5c9429bc0156deefe85a95fe9d84bde8c4845c0d6c0bdd8813dc8642aeb6895"; + sha512 = "4a0b66639dfe743bc585d35887f1c32bc93df6345b943e4e21909bd5613bb298273640bd97a50a38f1577a985368b169cfd6528da6b7816282411483f1a83782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "370c06a1102ffcd2c43b15618c677303a49b321b69833167089107ede0a0210251af3e25b83f27651e77fc2e3c6b921094e8d2fb1246ff147815d241b359a268"; + sha512 = "69d6451c07778120ec20003f7106ebe77b04569a81e0a9b8643e8436b7a05d8a6fb97f9d8d9e91c6bfec1031d0518e720520ccbcb9461350f4ae2b7efe421d8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "370bd94f9dd0c07dd24eb8be0b0ee217c5fe85825849db387d6efcebc67bb75926981be6de24ef4702d45e6e6d885a34f5c58520e5c95bc82cc249de794c7b3f"; + sha512 = "6cbc42bc4f147c6f6a30e41a42b019938d8984dbe21f6f01be689b212f3308bc409f02c5dd1337edacd29d80ab5af2b67e14fe2666d349d3368030b551965e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c1afd15a69938f75d0da51ab5911d059589011a6d9c4e062a2cb07e20e8743965e2101fce31a52714f6f24c94d4a723c6a133563f7e6bf2b2f2f11f1b34c59fe"; + sha512 = "07877f515cc5c04bc03173108321ca019432dc4440bd66b3de0c8bcefcad22a2671a84b82ea4120a630b5bf732067d59e0be9abf003566ce4e00da8ae64e3d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "077c6ee3c1a7ada84989542265ea653afb3d10623ff765b7e0f41f1fe2af92e52918279612dc02e6c3b5dc1671128410134b6ddbe693fc892db52cfb0f96db66"; + sha512 = "db8c70eb94f26d07f6f80d842b632353e353ef4577fd341f3c66e81b48421b948999104570a545cd3366dea286a5640547c999f3c9ef69cb443b770c37c73083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f076b4d080e07af43f53c7a88a1bc78099ea6245c14fa33dd9626da6230c6fec8409dc736250c3493e86209c4ea0647dd4869e5dfefe65e3a7ba3f10646ebd07"; + sha512 = "a4b7a5bcde4951b94cb688b0c9760dab85c879ddaba0627113f53b80dc80958fb85d8edea61e6a923f0aa8d78af1ee751cf40c34683aa077481cca4a6688c65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6760e7f7a2a54f89990ef47bf8c22c69ba3233182e400df40f020aa994dab46feeb98faa219e9d123c9432660b7247c39c3f2a1138cc52e2bf5bfdeeede60ca9"; + sha512 = "37c477b745d2ed5c0fb0dcffdd2727e3c95cb73e5d5d88a5f707bec8be3deeea4e05cf35562059a8274734524a85987943d7a7085e3194fdd83eb4517c2c8870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2a2b61f47e6d0210523040a19cb2d40439c71391153f8e5336967360ba9303028bce1e3861fec0d8435c08199d7812b5f7bb8dfc1c62a7bd42ce72f06af0eea5"; + sha512 = "a037c7a7e98174c7ea9b2a87ba0fdc0dd1059fbbf087cd6f6831e3eb0a06d223dd1a2f99a52898d324f40d08337525c4604f35bd154b216d369e9da70db744f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "203c5368da99891c3dbd87e919aee53ae2a1783ab982280d5eddbc00c60ed580a4329e7288275d5c5d29ba084e92e187f219d1fbe2e00b35176ec8141a1bd60e"; + sha512 = "558a10aaa328676b5540990cca5be794e5dc7202a74cc97948db71642ef4d045d16ed5a72e816d8f0ce63741fd78b815ecdc1aa4a2fd4e4241d1ebddf5d25022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3bad264a314ee943e656bbb547f0a88bb08570d42ebab47659d4d2d5436b1726af072c1e520c8a2e1bd29f6bf819535b7fc5999658309450f3609b01ab8b8d28"; + sha512 = "810b5e449cdc78806b9aee08a5a43fe0e5f771e49a8f2185f950609d397b9cbb80ba16c35c8efb24fb8d9d6d7b1e41a5a3da1374c84a919f47c3db70b31090a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1dd65025483e00c557f926692e3c0ac274a27f0412cf556c3e0ef864b1046c7888c8d354e931a419b04382544cff5e8f83ffe3ad3a4fbb040d7155e6e45a3e03"; + sha512 = "39762c036ce21ce118dd5529b35be17fe9a8f03753e59deffe8903d20f73355ff20466a2a4d3e400826575fb08a5882002019421240490987d7e9b9215499654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5863c820b36e54c6de3428e3fd0c54e9ee4efc1fcfc6fd3953163b042e93301b04b7243bb56284b83c283cdb8e3d48e0068d4cc18818ec350b9ccf17703011c7"; + sha512 = "12d9b7000d8a2a3b0c0930b778a0e262793381dc57ae53532043c2dcddc520ab931baa67eed24c3bc2dae8d9ea198a34250d41cf61b80b0af18aca24b754387b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "eeb69145ad50f7868859392dc768891b48a717b4609d5320e8aadd73d03e6b3124740f97b1557e4fc52d8b128a22253194c624b5df86491a4d17ca9947526d9a"; + sha512 = "3c84c453e4d583b2df67649badf90f0dfc0d25780d1d7cb5fb38c9b9b749a25842d986554b4cc8a66aa4193f93688a570bd7ccbdcfc901203b8e240bde2235e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a10c3cd3d0117f51666f92e37ea1f8df818f5df6ed96c1d99a88a277317b14b7e1a87a67a0b100a2cc22040da03a91ac3916b11f1b560e60fc8b03f42a21e3c3"; + sha512 = "dfca240828b9c4e4e7b555f6c7e33c29e6b095ef73b91e87c548bfbccc80d78a25f58a790f02de3d53303ff6a554dcd0b538a0bd5a34e95469bf0fdb319ee4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7e9fa9f157bef60f53d752ce1309146061f67bf1b22c5b1fa2f700bf825ca84981c5eb6988a35719d9871aba96702043a8eb108a1a99f5ba6a69206f841459e8"; + sha512 = "4080e78d935385a39bdaa1a1433642e89b2026e4803bf76e45e92da9a741ec5bcbcff5fbcd6dca6cca072334610189614382df9d6d1cbb116a0e95758c2f5930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2aecd034f770c2b005a11b9debc589a50f84495741116644f06925d718062f3bf2d23238e9c62ff53e73a47b4efcdca5bfe86242f58ca9aa3b7b704b04737ab2"; + sha512 = "fbfe7107d0f3c70c283a643426c530e62a45962973818311dd3787563c54ae8fda3826bc8bc807ed5b9fb281ac0ab163162705cccdedb84d3f8cc2eb2a68a712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "01f8ffd5c3f0f5084f41a9e8cb71da6cb985c689b4acc534a67b34844b7d7c3851d7236b7f0f5bec5488ec0c332373e19cb8e2e44595e4482ec8a3ddfd82f5fc"; + sha512 = "5fc9c22452bf775577ffacfa0a6a328265e5143c0c7804b40fa33f887eda33cccb95aedba9426f65ff60d7d3fda28fa4e82bd7fb740341f4dc4d5991526eb3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "0706b9f070ba39b787b3743806731905144dcd27cd52681dcf431c3d0feff859ec4071c3d289dfab818390e964cd63adcc526d23ccca81833ec78000853eee46"; + sha512 = "ffb74d1aecadb920208bf282e5805dce203d854f79f733d34dc5834b065e2bdd5f9feaf2646c13247be9b9a3fc47f1277a917c89f86f14285d7c6c41b9399cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6e9f1f8070031d79035b9b607f3c8db80d32134e0df44cd54eaccb066b9ead09f239a59f29f28bd9e1237c0dad23e300052ef82b0a1c7991d6feedc7b0823844"; + sha512 = "7a127b5901965324d47d2fe2a263ee7e088df95cb7a53014a06bc4dbfdef0eac7026272af2616c90e2dd7aef82be12dfc5fc7010b306376d97db9588f30a1133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47d02d0780410b9fc9f062a981b3bdfc46d3d784112882a72190dc4e361ecbb34fd67bb730ed5a5257fef13015d705746939a0ee9a0357d028df0498b83f7781"; + sha512 = "704022cfbc5ec0d9bd74c6782354c507cf6c1945fb6101bfa5bdafa982c69c38e66527db09a00f5fafa4b7263e9b5e53f95b68d6e4be24f9c4f48d90d63db38e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "20b540c40eef7bd437af29378468dd60d923f38fc09544ef79c37245aeb31147a40f5a60784896c16b9565dd0689243f7d5d3dd8ea1741e454f192640e394b85"; + sha512 = "a2efb994515d3c85e501c32f77a9bfdbb80a27e0e30f6cfc0dd877041906866665d7663266acc50d1acb73f2d56349a80e47ea51ac4891a588f40a2861e89007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "97fb206d18c8a31dade78ef73cf1e8eda6da87ef137f6e708afb7eed7016d0880b3ecd29297b27969797d76399bafd36e0e644b06c585a8ccd44c9a734daeb8d"; + sha512 = "bdcda65e9f15ceecf75294af72fa9dfebd64253521545b24d543b3adbe2f98418700ebf0191ad5d894cec4cdf7457a2a8a2f60734b9a437f35e870f27efe5d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4e24731741405fffdbd71a1ec71c7153b37843a148e0afc6c63114a65467de00143729b46d715a5fdf2f85ea51b45a550cf6a18bcf655875880766d4cfbd0f6"; + sha512 = "a2d6b96afc9f2f3ea5707504329233c536f4fd387f0125da39bd68d94efc40f46080f5184e45362dbbb4f44896a662d7855ac4c57be44c4b2caf9dac23f899d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "05f90be2bf33ef4cb89ed99b7509bc89d68e0800a472c47852246200b4344506b352ce9c47a72641ce5cf7324900aa6460f1ff4b201e5ebad0c17302e1985d32"; + sha512 = "82f87813b206d623680b20ef3f687f59fb83decc4479e25f6bbb7f46d986ec805ed054c643f2b5955c43925d930a04ead99ebfad2862652f4fd4e71043f137b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "62a3833f81a050c8d686fe48d23c05572c097178b2f38df27119d443788b02980682984fa9c43aa0bf93d7063d317eacdead1593cf382b9b13f45869c4f1041d"; + sha512 = "7b023117930f5266c75819fad5d207aa9a177776864a798cfdbec24ad25507af139a184b593b267f045ef381cac8baa28240d5788667dfae37967e4364fa07da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "60ee63b9e762d6fd467901aa79190f142a2cb3e1ff2360e573bcc8c23ff3de37f30b8145794ad9e0720cd0db9b37054ee8217449b9c9c1a29f799d2a6c6dc62e"; + sha512 = "cbf905036051c20ab3afc1899ccf5ca2db3a137023764f039830d996f515967b78a02349a118d0bc0be022be353b0ba57e8f27b8baddd21ff4d8eb240577b208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "bb6d9b5279b279c72c708e301e2f40c2238f06dd75aa431d442d2dac33638efdf61e9228572f28c559cb9fa5132ac031d743288099caaf9cdbdcc9ffb7899228"; + sha512 = "f7a109193d3fccd09718763d44f9c30313b2062b25c962e4fe4273e62f630655cc7c162d2b6648bbcff89469d5ba26fc894c330f074dab3924d705e3406dc9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8e854281742ba2eda03404d24c72a5b765ae267f87e00b71edbf9615966ca6cb8f1d742ce254001a898fa247633c6d66249e32172649e53ba5ea89308d97cb3f"; + sha512 = "80a90637d8678a1817e653f50ad7a67b7bcb395e3f6df3e39f90b575b9d554e86554e0732675210ac2979e030827135a6ddc752640b7d6e55d6a6c0098c9e34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "2dae6b1eaf95e735adb0d4299a7ad5abb3dcf15ee8fd117f200600e3b668d1d4a0e5e23a3b1db2d3ca00498b1abcbeef1494dea834b18e43bed067a60000feda"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0a5976df3aab1eea107ca06812a088b7c2bdf50234dc405461e1e2b9f9f51e2974d904066810757b7504e8e766a2f08bb897b35bfac37736691da7aace35d6bc"; + sha512 = "63e280fc13f34b19b07fd2dca94f38d1d2d6a0d2d300b430dedc23ef60d248bab8171dfd8836d0d9476ffdeab9951083307b36fa2324cd39feafddd71599093c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "40527b6b86f91fda49ac0a379dd86519065e0c27a3e71a5b4a3f20ffaa3b8f15a9c9dc3d4b3477140c8bfb67bdb013aee1ec739c5ec9681cc381be31d2b8a9e7"; + sha512 = "03d8cbc65efa158d1b7fe303db38df37648aa0f56b6afb7a3e6349f4a658946e8b78fc892391866175966387b90bfcad3e1543b615521c4c8aa15053a34b60b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bfec1005f0f749dd18e2d442b12f91e6b3a3a958cb2ba384995349b336ea104525fff29edb397ada2f09beefac4144f35ceda1ac71f7b49d8a1c6dcdb3c8a982"; + sha512 = "a5510a63055c47b313eefe5d4aa21b1e9411c9a155ee4e89fc3438ad6a0b9909bc197ad5462bcf29df4e7bcd8a86ca0eba33ed222e15d4061cc4ce7bd67f757d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e98dbbaf1f54c79c515b50f4407e1cb9fd09facd87fbc537c834d82236fa8a512e04ede57562d539752cb1d792a27f61973a6ddbd0ae54e96f4f090f0c31f953"; + sha512 = "29908c15095edc7701609dc8d2ac0ab3a8ec2f18bfaa74e5b410e80fbc2f1476f3f98db67dece9e8caa37cbf3e0f8034cf791958220a906e2b53205487c9e8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "67c9f943b156cdddf7338c8b28ff6a038c728469b4b56737ca90ec37215aacca419d67bee782715e38a0a19d6cb71e2d03175806727025956d29ce06599da658"; + sha512 = "1b2cb7e7fa15219988b87c465c74516d04c8642033504888de896b8c29555073864a5f5ca9a39baf3f273dc981dba139322e6f65c242dbb69ab5d335e4952540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8aa5f0d088b2dcbffbc3aab792a981a260ca47ca664cd9bce1524895c065b694daa54c1634ba750fb2156ece43ede1ca4b677565de0d7ecfa262417537263ee6"; + sha512 = "232a910b28f3e415bfbf2ba56167941f5076bef3f58c24d3647fbc2c034ac71a1bc4d4903c4e7e26f56f73c72a4759baab9e8a9edbcd848b6235337e095100c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0171bab869a15aff9717a8a12073aef6c1de7041e819ad9646845fbd439466ff01ffc4de828bb39f0ea197e509573322d7720dc7f29a3c0b78027abcb0b5d728"; + sha512 = "3ab5192cc1bd24a565cee5a24e4f11719fb6f052c6503770bab5436b308b2ea1aa935b40ee4fe9a1168ddbf206c9a8361585880cab0380cc6794b15a172b2089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "04bfff437a5eaca5ea4d6ab36fb95417b0022a4c6258f06198be20f97f435094a915c1417f6adea650490a789301367d665e92a3db965b8f891bb4d013bef80a"; + sha512 = "d5ec7c8b509370002108a741c46b1846d03af3805e22724a26d8195cfaee3a5bdf09b1140df2755d43593bdb7ac0eacd68df59348e818cb0ebd102343a30ec4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c6cc47cc3810549957eb17f36537165c86b6a96fde6fe6b2c2bf6cfdb5e89dee594d4cdd71b763299fd2d70cc4a111b14c13429e9f0b937f86c80b1daca9d2ee"; + sha512 = "aa3bfe0fffe0ef16ac9ca5ba50374eacd82435a2b2625999e1663f4335dd7f0ff56559ef43247d858e85f7c6bdf8c2dc971ee7cfdf457de99ea0434002c40571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "68cc677bfb3b0bd62199648e9fed7345940935e4124a8276097a66430e5579fcfb5f12c0fd2509be642a55daecc193f87c08f817a3130eba5d61e060ae543bab"; + sha512 = "d41a08fdb3188c6e9c8c97e3b4883442c9ec8e2c4915c179bdef70af8da8d31c2750b8128298de9fa9a7aaad1ed2374ee91285057eb5e80bf22845572df6292f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "84f20aa1d9587e46ba8df0cc831c615f27b70517b454056e318aa2e25a2c5affd690c384cbcad13a787a824884d8b2f6a82d5562594aba1df502546a68af4cb8"; + sha512 = "7fce80e993a00210aff7afe4f75b19e55e39e2ccdaf6346186be1fc508df298dcab101da349c7c243e736a2e3d4b5ce59a7ed88c5f5602e2263d0bde3406472e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c003035c001fb703ed3760a74a357163d0e2a2c78fc9f9441aa477f5b90007ccebf209db7064ce93eb580f548bf558e0706baf42143ae5ce68e04b1fd970a831"; + sha512 = "87387872c03dc64afa6f92f36614898de6d22f946a8f65ee8647a1b80705e180dc36688f23285a6db8fb57056ce7d6562251cea9bb44bf9dc60a2c63c6d74399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d365e9de7a51dd3fc0d6e5b20b72c53cae3c04ec7514ceee3b90b9648a852d42c88371dd82b6fbd0152e02d43676816a6cb2c7cddf94974f91c8307bfe632209"; + sha512 = "d09dcb33a339c274c9559a3835ce376e0dffe4bdba6c80dd0de877ea3324a3ed752f5bb7e1f28eba3c5ff48cf0fa85f0807756edf8bbeeef22bbb163b13bd433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "57da42f68f1397b59f41486a945e1f29cabe9db7bdda3ec93c4c313b48eb8cade04b2735a6f4134aee1a1c62c8780d7ac599224dfcee994c893c215f6ab99243"; + sha512 = "5180d006c4fca181bf96b5cc2a36f6668398ea1670b3bae4ca3802d30e3e7f6a0c9f0bf26ee4e8596bfaef451dd3724dc0e16e95eef5d5117bd67d39a0967ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "988680846f81922d419561531af99172d20ed3b7fb96c52be17ed50abef947d86dc4c79c0b8bf99e6b1275eb91e2bd4f0f0b0d5caf51135ad989e9f5dad58170"; + sha512 = "7f95c5d348ec4b9881a1c0f2a6d6b0b71f98f007ee9237ac11a5aea0c05266ecf9f2b2a1df6cae7926ce338e04e2930fa41ca394ad6d6434c2eae225e3d08276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a1e3d50f339ab4de550f8bc28795cea6ab5c1086defb80effc9847c005d8f9dda6e0cf28c09c19fa771682f5c3ffc2344178ad2072f51a258037ee4cc9ddc027"; + sha512 = "fd264de05253312e94660883857194c80049435398e39cdaa45d7c06f2f39e356903f14d27c70899f71d79aed22286476ef65fe18737810b767875d8557bc67c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "43989eea2de832ef6d32353e1c5391709b575db80d6602404f002b3869e55605f5b9bbcdae50a8755d09c2a7f0577eb3fa57f581d132c9d1e0b11313976be9b5"; + sha512 = "a82e59321fc99f0b853e8febaf74ca709572473a0e1ba80c450b83bd213a27c0d3a42e13958d239ed78078abc22b518c19f15a9f6ed95b2799c0b3644aad724f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "a77de1b17a36e410b3b7e5088c8714c6223c1eb3cd558b6e7880675f8a7e307818e207376bfa3d9695bcc1cd271feee8225e1935cf80a41e7c6b0ec14a4f0f43"; + sha512 = "f2ecdfded32e7a99d225d6e535a24d0e7e73270020d0a16abffaa05a5553a309ec412ccd7d2fc45a0ea3dadd7a46f78279c1a6a79f884f00e06d9502e26b05a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "29473ea93d487757a3e9899f0bc09571a0c973f7d1426096fb290241438c1c32c3cc01130d563ba04e5a62c973a167d756d7fd314f970f0e6a2e0215ee0b93c0"; + sha512 = "3e807ffd78b3bd9ecb46f1c0f26b69be6108adbce27eb6235fd8d44c46ab8555dd84fb626a40c361ff7a93a233b03ab58754430fbdaa9d059da338decc45906e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "933c87a3c3d34648b7ef74ca5ac1bb4b98bdf0fd571b40265e7d1137d1b519809929e7330fd8e2e0fe635557947013a257f3e1009fb04657658ee8725a99bef8"; + sha512 = "50edcc06670da6e41903cc476efb66412cdb025e7dab4bc6777743f0ca59c9f8aba1ecfa445b25185bef69a950b24febf79dd6becb43b8a5e96cc23441285d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5e7d5c69c7da4c3065aa8f4e1ac6435ae294b6fa4ad813704863eb699f90f0add5c22ab32db5e32aa7ed797ad276f1c872b6b0ef0d16cda09d87e3fe9291e3fa"; + sha512 = "dcf02abacc28fa133db89513ed696d9063c263edf46e35e920804e1ec059c673aa9174181f96809c844fc42738a38d3c1abd7b0e1588b8b501ceef874382b103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bb2de84243fb2c80f5457890361b4b365baffa64e90afd354ec0606ab3432360a9f70fa406a75dff68e9b3bbd6e842a1566181a62c246af67559cb164f223d46"; + sha512 = "06d36c3e16e66c5d5a46c1fff49d7e42316a9cf0de734582759b01489a73b51a0e338db104635ae941a206ae18749be124ee7ce578517306f898b2a24e7e9d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8b3c437ca5629c8751b55424c1a71ad9247edd72f3d06b3dcbc9f256a5e729a7df3cddc8984f65cdb84a8b6608af339e84c36e728e64978db0ac6be21e9eb95c"; + sha512 = "77d49817ee73c36cf4297a0e0d97fb54f4551051a444c61ff15ea8f4de3b10f842307ca5ea58d588f571e967b3abc1a2a8a5f2cfcc4f08e3f3e745c0a2f8b2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e76dbdafa7d73291d9674de2e6faf84622482efc55aa1ff94bc76bcdc6aaa693bddf4899fe10615f78b2832eb541cac2b5621092b53ea8d2d682951b15f52907"; + sha512 = "07578453be912cda63cb87240aa8254b87a64d119339d9f1a89fa64d397391f03e99d3177e2a0853f06f78e1008706735c4c8eb835b627cd2322c404c6cc0cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "72cac3169709b2293e0d00d9ad190635252047b3267f8ba77c076436682c7c2ba22006558456516e18d8331c21cef3644e9d59c76deeebb1a6328796746198a5"; + sha512 = "db3646504427cdca82196a6fcd56b133e06a8630dd3b55200a9627dba91adb2ba5f2d4747742cd89f1b4eda70eb95d06a229a5b783ccb68aa52aa40c6e69086c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "1c806e54898725cd1fa6e62c012d8dce5225ac1c423a80597fb9b3716e7aebd92add9dde916bef22632b5d4122d6bd42159571d0357fc77ee3a0f553dca71645"; + sha512 = "359d64594bc2009a4aa71e0d49406e87a071c312b78b51b82a5bf1501b3e75fa693029e7999846f2d0e204d43525a18d3bec5370d04c4fa6d27de0754950affb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5ccd9d2fb06679312590534542b34950875c76b2cb26aa1648c09e8727b60610a9cf9fabe433670ccce8e55e01c300827707163d0e071d176446f1590f4d0cb0"; + sha512 = "dde35f60387a9ffe930f77638660e7765e3bcad00116e5c36b9256f06af61966758679cdc27b254d43ef12a1a3ae0b3d5cbde7e338cb3e4245ab60bf29792d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "66f47c27bcf34d4a194f64fe40f069a7c1c799f5f859c9893f6dc751194a514022ffdbb3b6c9aca4842bfebfd6682a0b78b3972cc7710abd2f84fb1fd7a62c5a"; + sha512 = "7d480fb09f3171cb3b7fcebac9a548c16622bbd19822de288def3e6d3cfb56eb68aeb0c23de4c1c74e303a5491a0a818dbc420dee6d117f6734ed8a3018f4f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1ddccadee1a492e2a2062b370193f7b5d67a9fec45f48b4b283e1ef22a14d6c7520ffa209f365937458b6029b36aca9c6ede675f532a7dc12459874b3b746899"; + sha512 = "fdeef94f70504762ae64060590cbe59804aa1023d6b9095a96c87fa06c42919e36004917228219a012a3036fe64b6550d0f6851c56e09d66472385ba8a9764b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e00ab5b91594b53b7e95d975040159c49eca2eadc9bf70d4e6f576d216b454fb752e3860d7595db2aae5ea1aa980227334dfc6d9abe8076149182f77a859289a"; + sha512 = "446f92129d027d4cde2d34d3b5fda8890a5461db89a95e1f456f0beb8b59f77bad0306565062307d2b02c69504376e31e933955803ea0a08e8c9de10077c9807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "36e800528ce1aa0dffff9bf1967158f4065c35efdc40cd7d01dbb9f622ac1aaee31f57f11800d2e2617dde9064ce767d9728da2723276d20b7d6e0c822dc8fb4"; + sha512 = "0bf6139ddc700056295969d193b1663edc11c22832a789edf1010dc979f8da2d08f2c58ef67b37119dbf80fcb6b0564db54d1f15b6bbb94ee43d01ee113a11f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6acff5ec778eca029433e34b63b2ad0a5405dc4c6d64d12e899f895df1e43e21ced61cc7f3c0979a9c4e0237dffc0733caf45c66eea66f8d0576b56a80711d64"; + sha512 = "e1d94e02cfa454564a8d57f7297337189157bb4632f603f41678b204fd52c25b46c3bc2bb445fc947baa50a9a23aea287b747998ed2126a1de77f425637bf2b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "429e656266348d7b4b114d29c19c645bef26657bea0a5436eb537deb1e27f4dc30f3be0c48c2af4700af74e3f8b0256e60661e3172d0cdfac6f7be7754b40575"; + sha512 = "3de3ab72850763d06ea987fe92841024121f245ecc2c3e5ba44904bbbbc926063ee104ccf287a85cd88f189f11dd4fef12e3917c2f481659a03d99ad90ab06ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7c4e9a3a36c2393badd55f78461622154264365b709a4ea1dc801b1bc267290cb31414e036823fdb7544dc08930bc0a1ba30e9793df50e26ec3660bc870e0c58"; + sha512 = "7ae95f7a83ab91def7b2d9c83777f85b88ed5d4507a0b4c2b1258b46f38c08e6db9506adde4d8343cf92eafb595506b8c9ae6eb4c4b7c0735c367fc583d2f933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "26188cc7887d0093395699e9d504d2749a74cadef9280af4fdcedf34960b92308993b1a17b1b2335183db6a4fe734b0da7078c2301aab626b5cd375dbbe9d95e"; + sha512 = "adc3ae9055915eeadd5f1c7b3c76a562ec4043a3e73d6f0885a8577d9bb86b46ae4df2d537c920d9077b9cdafe14c78296e22ff76e18bab2123ca91c37df2479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "266922c89bc287d1f934a35c9909d3549ff298219d40bc1286d94e9a84d4122ce5dfc1a6e6a50393af01877a370822058134b3cb0ffe337df38f196ed1acc05c"; + sha512 = "b005a955cc8d47d9e00605fb02b508ec7153dffb5c4d0e5a49cb89dad8f7e4cafc4ce0c3208076e80611f35bd4ab8f8bca07e5112219a6a62aa87a2966342fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "42eed78f69e8d7cf27d839bb20a622271c09cc9a54f8242d2b97235b9865804eca9632aee86f88cfc19399e9f8d957efb3d71681d7bd3b85aa924fa2fe7a1bd7"; + sha512 = "96c1191ea09841dd73c7e0c0f25f0cb0a31cfce8d5231a18df7c54190e4dc4c6bda9fdc23b49d3c7de54ed179b0c6c876f4932f01f6dc0fbd79b5a97104629b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f751829a499b0b0df7c23239f90195a4a9578df5cbd14d3547bd537c70408cc8625a9af7a22e9ac874b1c9fdb61b89f83f3667fb2a08bacb5fdb87d2216cfea1"; + sha512 = "a457973ea05899d64bd691509fa1a0e915747015111e1c146b366cb3cd41d20563bfaf0d034b8935876dc53b80a02fd4b0e9c0a693a31a930fe6c70bc675b98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c96b866a94b39cf744cad0d4c404913db86ecefe0a5aa44051494fc4fa085a90864c57db953e415c09709c76ce146c6dcd12dafb4d887739d9b096fa9b28cac5"; + sha512 = "ea78673f152de3a08964db5bd9ce91a77c1725a947f6af2b074ef73987297f3f48fc37b11ee8e7b4a8a9f5369a99f56906ab233a3615b462dca9eeb4c71626ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "15a31d3341c3218c7da3413fd18db5eb865fb8f57783817394046b2d34790c2f9379421013959368f227209e5a7497c14a7b0d8e0e27debca389ace98d165438"; + sha512 = "6cbcadd3ac50a21409e83d1c60a533559602824a1deab1b3b66d89479f43dda4b44abbcdf4795fbe5291e3e718a5574d88388d66e8a79a842ad1bb29febe8e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5b1d2430e46fb427be89f97eaad48716607831ce113578355711eef1ee41c023cce5d5f854e65963b4387ad090f3c28b8507465057948059bae810c587963ea0"; + sha512 = "8159ff18abf68b9d3dd4744913fef67695cd98ff3e6eb2b7ff727c53a34949be9b49986e6a2c7b88cc1163075dfa688e263b7340ed378dbee285c03ab4cb9af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a9f3188c05350be481a176c8bc2a1017fa3ac6723644bc82d6595343e8b7d7cd9a5bf8d014a3f9e7ee34ecbf8371b78005729bb48a630f99ad59dac9651360ad"; + sha512 = "e5f1e26acdef22b51aad608950dd1a0d459c8fbb0f0b11a73bef67bfdf645366a56bab865a198e48fb8ad5a082cdd03a5b2682469c383044a6a6863fb5ebe295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "285e33d2a9439130322ece4b98137760feb929c69e41edda8a73efb258ee7b7d2f5b15a1587da48ebe1b85c4dc83a1b2d41ab8a52bd15ea3c332a8a514fc0a01"; + sha512 = "779d447f6457441c3723862a2487d5c807f709d234b07cc5f4308a4da39945ec872793b0868f7f8fca684b63623f05f03bd51f9ba7bf37818a7505b11e9e4c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "613cc263328545e42b1f78c1cdef685aa717c230b411b6ef1fa19550f309332dce7c08825a78990c766d900afd793c6abda60028a5a79ae481296ec34f75124a"; + sha512 = "e42cd6f92c9c5e3bced29c7310c571dfc2a13fbd0295200695ec1243fa94a4ef57d8b0bc213da1acc5c0004ad5c608eb84e3b8d8d3a7d4c0b9f46c055d22b80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "47c073e05ddde6fa6deca25a206d649bbcc89557e5eac2d55b6fd764b7341a0aac9b69bd7cf1c2cf8a80fd0a60536cf83a849b0ecdf402d70e113b13a409333d"; + sha512 = "b30f42f4d4824b8bfa0a31bc08a24094fec0c12dbe91449c263295c1e349a59bba04f13c0d0fa02884c673b3627cf356d567ee075bea401139640a814cebb7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b20fe68717a9894a630dfa78e8313f62b4054a6821c1daccdc0001653836247ce5d659f580e4127e8d96ac3b37f25a252768e9991bb429642e51a742e0dfbe6e"; + sha512 = "c3b3307bd8668e5918857860a639dda21969e2ebdc35905faf4f5788644ffe4973b99585a3966e4e127715ed3654f9d5151f1d3d7fbfbf6380f74f228cc711d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "94447d3231f864c7d6fb027e7bc44bad4408c32851b7e57cb5cc0bc35a89a7db1fa2868ac94d2b2284cc51e4f69457e00ee8965c5e1ce83c4811e654bd7e10b6"; + sha512 = "41776a30a2345be5845348dbfe5146dc1ccca4ace6fe5cc152fa7a08ee346b2e15be3a3b35f27df49ed1e199d43b6f70748a8e0322877386374b4678648cd912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "42c6876f5f5f6d860e79f852c55ac4661c77d7603a158aba0c26e4245a4f0ba9a7cf9822c6f1fe0c67c161b9e8fe904cb665f6b91fbc5faed233515e091c36e9"; + sha512 = "4130075d9546cddc151e2cfb3deb45747173009fd56ff01ad7b6c84f4de48cded9627bbe8e7cf9b3993fd4438904d78259ac1d75013afa6d48c7f81ddbe2a42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c6cd8f95b88d856c33cc62b1052a3d2956e48fc405455d227be16e58c251ec00d793ba2215433ccbd2a126cf77e98d629251ec1cb72c38faf4d544bd53963749"; + sha512 = "0ea7b52e6e065ce99ccdc7a2a126af8a2c5695ba5cce5504b308881450bed0d0744f445e0193300353b9a6497b29c1f20fb7bfaddb78582b478c6fd7225dd506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7423ca1349d7aff3469cb922bc33894eee1b4b46678767666369f6833df30a95b575dc5d175bee2f09b30b49ef6cdf93b144feed7e74992cd9b930114a46411c"; + sha512 = "3cc74dce8034e05d8839a7302cb755200e1bd13768fabc33281bc6d698a4311b4af4540fb407fbf2df71353e746edeab6ef33d9490e4851d615dcbabc5129d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3ebde82eae1ebd0ed41ea5ce842ca6717914961c518d4238cdd2c094c9e4b871f856547563da4dae1c5aac0462471ab56b1098705b47b817521e5946109b5edc"; + sha512 = "eada735c781efbf19f68c3fc92dd0502a6be3eaa1be3363499ded16d7ecf2ff55c8b3922c18bda74f516fde4f827946989eedaefe0f89b4f1378c08c8e4a60d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "01b5737ac9db850a0b8e08e3ae36d85d9152775abe354f4014604e3e974dab273950d3bbf74ccb921325df87d565cdaaa9bd59109f8d1f887ac32cf261389fdc"; + sha512 = "85ca6b655f77ea788d0a7f35cd0af4c498189dd9b0b69a02f7efbd57dbdbe7de48d20f1b74487ab03a136a6c64f9606a1ed3472c7510107f4dc4a82473873152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b40698c13098332e0ac4e0070589b05553a5fed58ec823fbd9cd12caad7662b2394dd4cff1d05f025879e20821b3742f9b07f28fe69a9f34051d9118204b63cd"; + sha512 = "1a953691cacb7aaced202ee466e217feb66a87eba5789b77beb98cf4b8636d6f4880f2a3608af9392e0363e596588f2cd6362553ce301dd26d16f5cdc62c9266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1d5ffc9c578b625d8dbb085c0c681aefb8aef1a962ed4e7b8e05d7a8062f11a7ae792344acc5bdd41be66a987aaee0edaf2c5e15e65ff509c36e4164bb45dad1"; + sha512 = "298dafd3d49890c295ed24e525424cd8eede31bbe295509e5eb24e815c51adc79848d391af61c35cc79be30feed2990acee9bdd3f8029b11be2dcd8090f43ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fd2954673b8a1a1d6e547db8ae830ed89c4b7e8bb70debf344e76f7dd10aa73aa03cdbb0b788fc4c4e9fffcb5f6a1536323481cebcbe35ccbc5c4317ac813db5"; + sha512 = "fe779f5e6cbce2be6c12a934a2b83681ba77bb570a75c2b9d7d68e27c34823dbd88c14e75543900c38b1edad440a124036027dc8756527b9db0c7bdf26829b30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ad9b660ae4c8a21696570682390de7a46f3d6d2c8096e7ee0c6288b69b0ed95451b06d6b84ee1719a4f8d90c7d9def61a86cc4a8fb0c2c6c8ad7801d8ce6cdfe"; + sha512 = "9423cd6a91564aae4af0dc53db5cee24a93f97bdee5c6311c0bd798395312a583d4a1e45ce49516a37cda3864e38b0f243b5502cd380dc9fee08512d37573bee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dced55cc01aef583db533d5ffe8960f87f7485d232b6194003f1625e370a6767fa27126dd3d35f5e32c295c6f20ebfd4fcec983e57e56b160430b04964c84cc3"; + sha512 = "49cd84478b01cae06135706e04f43768d989ec29cb418595476bedb97c1af9ff5e99cfc1e2e13a0a447ca4a6450ee873043c612da76a9acf4e1cc834db40976d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e3a7deb350abdfb188a11dfb2f2e1569603019e3391ccf97fc84faaac35e9fac7489ddb97220845cdcaec6321317f6a10897de0feca68650f5fbfdf13644667f"; + sha512 = "0f84b684db2d68be8d344424f8ad5bd3bb7d4b9e48304bb305d6cb5c7622cf2243a301a51fb3544c6fc3526bb4c17088771d1cea86c142fad6d8aea4323dee3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "439b8ab31a627df07df9d9cf0a713a330cb2fdf8af27caf12367077226327c60eeab5b1931a0f2e978c965e402a7c8ef31d0e06a60515c5fbc6c03bb8877d922"; + sha512 = "5620a6765d5c911c825477129a7fed51921ad0c7623d81ef8554c86015ace816a38ed2a99ea2bdc9d04144aa301eee8a22d4a773a80fff642777268c2885ea12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e90be9907ffd6a6e8edf3c5af56faeb1b57f27094af50f5bb583c2645267e4a47c9330c8dcd8727c51eb83920c7743ec88b5427e72c92fbf66fae7568c213d81"; + sha512 = "fab980c5319bf1e09d9433fabeb48657929430d79154817e414b3abec731271a5444485da7b4a4639564f2cc1e0ac1c862c6e048a7f955f0e8282f3fbcd6a897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a135e841a1eef634684c904df2b3170ef4da7a6b74e4e7e8758610ec4875910328a77bf686f280b4c705eb9cda6939afe1d7cc23b4e1f45718ceb630a99569bb"; + sha512 = "d83016d0992f3f2a707623e422ad98b1fcf7ba2e0f48524ce188ac68c1e9e1174a3de95745f3a1f804cddebc790f4e46f1d6184b5ba30e5b839e208fa83d0946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "241b8b72761f475cd3ed482cdcd3014bd574b1654ea37bd82562c273473f56a6fbc20a44b0f38dae9611629871e5122ffcfbbf006261352b137f5c04895f0a26"; + sha512 = "e659376911924a58ad5a8298ae98787307d133dcde179c8b1f358e929e7321dc87eec8d2a601f4dc3aeb4cdbe1105309fdbb9efdfd3d22828d5ae6e9f627819a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e5b5cc8fcfa68a6490bc0780ca7d6aa39be5b7f764b74ba832be25242fa19cf1b079b4a67d4f8320d01b64ccf636010981072f81aba5e01bcb86607ee09454c6"; + sha512 = "8ee3e51d3549635793ada4af651c063e3440e0a5bd4d88af15d33c783b03c97c553cad06872b60cdde416031a81816b546c3452e07e93535bd97c38d3f278833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c3e1246d2351df36ab477d5ce9cde3badf041df1c93d80493786d9d14f2241fb04367725264ad1c7043de193a7188d16b1c646c1ad98b073a4aa74fcd36df15b"; + sha512 = "ac8d9f7ee122c4362a1efed25137ea34fa2125c563d150c3660a079b9c9af35eb3a90f0fd96cf5fa3747df71e040f99953847b065ce6a3b568e3d5cce3884cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c2d87fc3adaa26cf50534ad0db581b3130ebd6906976183ec3d338e5c71a48fa1c81107c2f690221a43e8267cc7166b1ad0b75a6fb20a813d8953f145b37128e"; + sha512 = "d044cfa14abb017c042fe41bcd8ce8acada46c461afc308bbf3e8475c7869ea228aa7cdcb5c18d97f49fb4feccb691ab5c13232c944b900ad478bce08c070232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4af7da8131ef8d9ddd1baed4fd0def10c648addddfbf3f14605478a2e8ad67f0e713d304b36aa32a2abc2e506b8a56485c6bff13ad7ddc3091e39eaf406a6c32"; + sha512 = "ac3e16d233061a774dcca9ae76f6c2f4ba42b885c771d3da1186e1329735efb1fb34e7672a050058cacd2d3db7f4bf4d60bcfef77529777a7ff10ac7f93f30d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d90f085f2c67def801484808f49bdd4b7862a9f7e2701025510fce2d7ae1d5cafdee4d5c42ae288ed45ab86a71a3893161e9fc7b84403f746d9fc72a754e4f1e"; + sha512 = "89dee1fe6edaa32cd5f5eda39ed175a3debc23de44b116f8de32e38e1827a7ac30613614ab3fc6401165db0d0486db3c94045750e37294a43211ab9718b26911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3ef8eee4f684f021eca667ec29dc4ddc1339e83a6ee93015fe5f24dc91a804f8405a958b0647d9430aca6202659a811720401a960b36ab6b2f54b53e6e88686f"; + sha512 = "3c292980d3ff21d59c98d68eec743d397cd76516561a610d912866bc25f0dbaa2db70d76b7bfcd94dab21cf86857e134f9ddd5bb85b5b38be86d7987c3cce1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff4e3d40ad392c0e00dff2d0720327e45199597d31128e3e67c8cee77b63e39680848351c947df46825eec862afc1adf24880a2a825769b222742adfbeec55a1"; + sha512 = "867b8860acb1764cefe3b5b691beb9a2c521f0738b927b41c896517ef7712d6e082eb15272b8aac3efdaaa103fcdcd57279ae71096b7a94a851121f7e7103ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "5dbb673c93c84a7bb30704503869f6cb43ef42de038507d81daaaec4482ce93db74b1f43c8c50881768fe94cfbea95dd2f7ec376409ff2779afcc08727ddab9e"; + sha512 = "56416e1fd7ba25d1a6d0b65e5a6f0035addc2d8c28145c6ee91a2dfe8893f6fbdbaaf82a05304b687512e4f6f1b8798e9c83bbdf6a1d72bfd32a85710b5df91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "863cc55f0f44f5f01d5134a5572b39367ba899457bc5fca3f60b62309a6212546a3b8e71945c70572ce311fa9a60c09cd0f4ac8c2f380692f806dbdb4880c648"; + sha512 = "c228886955089f11567361056d6ddb043617e4d48613592be7d2ffae5cf8528a7109eb10760fcf7d731aaf26d1c6ce92cbadca32013864c2a29117017aa3552c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d6550a25f2c81f55799032ac2f78f1db50cded6e06a8ea06144d65edaf619a9ea0ad9e2571fef4614e744c5e949a73a414934f70fd18710bfb0a54022685daeb"; + sha512 = "e10d8c5e1723148909ba855c111ee077942a8d5a3d8154b10349a718a8fbfc44b3eb366a95cbf30aa01e71f9123dabad27b29513bcd2dd31dd7665aa5c01f060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "089b8a19ab110d3358dfc8837d0550b954a443e5ece3cb779d06a160988f0be2c3ff3b1fdd56d2daeb3ee625cb880d9ee65246c80dfc5dd58b49ab0e2d7c2302"; + sha512 = "d2ffc996a3bc7eb852e4627a4968d6e48ea3b5d7fb19c756f90d42b0da4ad6325ae5bfb23c8feab969a3fac96e5712fd1fc8978949d59f677a9bc36f3d440d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b7010185038600d9045df6e5504f34745b7ccf0b031271474d69bdca2940f95e7bede030fa6bc241696fcccf971ded644970c829c612bd13aa0e4452e0ddf27b"; + sha512 = "d6c045e3fb066170da74b347fe75542c34a9c7eb758bb6d85a26313b7a2d1183aa3d1a65088bcfd1dc675c44fc0532c9d6779f8b1f11236cf2eb8c287fe17af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fca5c5f5a2f667932aabcf7d112dd4293e7a0f2df1a400b9ffe60c9e08c4c0631df5834778dec3f3312898a4b1cb6d30637ef6b78b3868a49dcfa3c82858bf83"; + sha512 = "169196a370bc41bfc6f03c43e70d966ec2dcb10f2727ed3750afec73df7a33875af20dffe3bd1f2a97671af23b028f9de85281245f92243db1bca44361be77c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "da337172f306b816d1004c176d5ea4f968e65c126571cbea323d85bb35c7d51a6214510b709d20a8574ff7686ac9168abecb8c8c6ddd33137982e4e7d1519e99"; + sha512 = "3f1615c4ae6cc297c749c01f0eef3620f0a789220a1f4bd052a42e3e92a3a32ef141ada45c204ef5bb3646e0a1964f1e580e149280b04e1189b8e6c6e1fdc733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5ab07868511a6a2fe31e5039bd52aad753782fb6bc6c437caea66cb8264307203f2fdfb711a49b5ca4dbc8db6408b21e309f1ca4f7b4f7ee3a47bbc83b3871ef"; + sha512 = "5f82822c82b0efeae25ca083b27a3054136a5b881139bec624764171bc1e91c352e688655006e00aac039b743273dac1155ed6312ac5f016af6ca18bb969a56a"; } ]; } From b97b0300f6b612640b3750811005d76ab313e79e Mon Sep 17 00:00:00 2001 From: Judson Lester Date: Wed, 27 Jun 2018 03:56:18 -0700 Subject: [PATCH 211/312] Adding config for the tiny_tds gem (#42406) --- 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 58831d2cc4ef..3c355d085760 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -354,6 +354,10 @@ in buildInputs = [ kerberos ]; }; + tiny_tds = attrs: { + nativeBuildInputs = [ pkgconfig openssl ]; + }; + therubyracer = attrs: { buildFlags = [ "--with-v8-dir=${v8}" From 75ce141a3587034b241253ea2c3b75c83e637790 Mon Sep 17 00:00:00 2001 From: Pi3r Date: Tue, 26 Jun 2018 21:33:14 +0200 Subject: [PATCH 212/312] haskell-filecache: disable test suite on Darwin See https://github.com/bartavelle/filecache/issues/4 for details. Closes https://github.com/NixOS/nixpkgs/pull/42629. Update configuration-common.nix --- 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 acdcccd43558..1cc9dd6451ce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -919,6 +919,7 @@ self: super: { # With ghc-8.2.x haddock would time out for unknown reason # See https://github.com/haskell/haddock/issues/679 language-puppet = dontHaddock super.language-puppet; + filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); # Missing FlexibleContexts in testsuite # https://github.com/EduardSergeev/monad-memo/pull/4 From 2b22ecf01ed4be0f070dd8c04645ea0790135a9a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Jun 2018 15:28:39 +0200 Subject: [PATCH 213/312] palp: restrict platforms to linux (#42651) --- pkgs/applications/science/math/palp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 5f5c000a87c8..4c7df4412e4f 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { # the right license. license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 9ce041a8c7b835ee23daf9bb74a864170da9637e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Jun 2018 15:41:29 +0200 Subject: [PATCH 214/312] pynac: 0.7.21 -> 0.7.22 (#42650) --- pkgs/applications/science/math/pynac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index a3ff0d6d0f1e..1a059aeb1670 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; name = "pynac-${version}"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "072mdziyx52y0knxjf2hs6nab36bckkanp7g6ff6qiy4fm0v8q04"; + sha256 = "1ribm5vpbgsja4hbca1ckw4ln9kjkv608aaqsvxxvbs4z76ys6yi"; }; buildInputs = [ From 1327218d8a5ab95c01f6473a433801c587b05bc4 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 10 Jun 2018 22:02:17 +0200 Subject: [PATCH 215/312] zerotier: interface names changed; fix no dhcp Since ZT v1.2.8: ZT interface names are no longer named zt. Instead they are by default named zt. https://www.zerotier.com/blog/2018-05-04-128.shtml --- nixos/modules/services/networking/zerotierone.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index cd1617b8e2ba..4c1ee75d536c 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -47,7 +47,7 @@ in }; # ZeroTier does not issue DHCP leases, but some strangers might... - networking.dhcpcd.denyInterfaces = [ "zt0" ]; + networking.dhcpcd.denyInterfaces = [ "zt*" ]; # ZeroTier receives UDP transmissions on port 9993 by default networking.firewall.allowedUDPPorts = [ 9993 ]; From 63d82f3a1959f1cc26cddd5631657d2d52bd9b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Jun 2018 15:46:01 +0200 Subject: [PATCH 216/312] esptool: 2.3.1 -> 2.4.1 (#42632) --- pkgs/tools/misc/esptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 1d7c47c2c9ab..729b4cef03a4 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; + sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; From 3f9d9686377464fe0637c693a0c801b5df75ec34 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 26 Jun 2018 12:17:04 +0200 Subject: [PATCH 217/312] libvirt: fix iscsi storage support Turns out, I was testing #42545 in a nix-shell and forgot how it handles dependencies different from environments. --- pkgs/development/libraries/libvirt/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 49c1b054b77a..f2be3b7831a3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -93,7 +93,10 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = '' + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace "$out/bin" '${gettext}/bin' \ @@ -106,7 +109,7 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; enableParallelBuilding = true; From 3eac18b553e8b5b4a992264d765b9e576c5e81d2 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 27 Jun 2018 16:34:59 +0200 Subject: [PATCH 218/312] vimPlugins.dhall-vim: init at 2018-06-04 (#42648) --- 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 a94707e1afa7..06047d91b7d5 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -716,6 +716,17 @@ rec { }; + dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "dhall-vim-2018-06-04"; + src = fetchgit { + url = "https://github.com/vmchale/dhall-vim"; + rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38"; + sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499"; + }; + dependencies = []; + + }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2018-04-15"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 02988df045f4..0137c2e6b471 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -260,6 +260,7 @@ "github:vim-scripts/wombat256.vim" "github:vim-scripts/YankRing.vim" "github:vimwiki/vimwiki" +"github:vmchale/dhall-vim" "github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wellle/targets.vim" From 953ab8fb4f49ec0d1ecf2463f7ebfe606e7b9a6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 07:59:13 -0700 Subject: [PATCH 219/312] snes9x-gtk: 1.56.1 -> 1.56.2 (#42446) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/snes9x-gtk/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2/bin/snes9x-gtk had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2/bin/.snes9x-gtk-wrapped had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.56.2 with grep in /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2 - directory tree listing: https://gist.github.com/9099159d34f80ca08f46e16de03222b7 - du listing: https://gist.github.com/089002406d67da563ace4b09e11494ab --- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 09e3fb913243..79832227a142 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; - version = "1.56.1"; + version = "1.56.2"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "1zj67fkv0l20k8gn8svarsm8zmznh7jmqkk7nxbdf68xmcxzhr38"; + sha256 = "0cbv95799gpagf6bxs1fmwmxvz5qs9g2rmmf5fsdd1cb4lryaijr"; }; enableParallelBuilding = true; From 4ba965b0362dffb4672c532df9e0430ff1b4c6c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 08:00:12 -0700 Subject: [PATCH 220/312] openfst: 1.6.7 -> 1.6.8 (#42472) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openfst/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstarcsort had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstclosure had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstcompile had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstcompose had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconcat had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconnect had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconvert had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdeterminize had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdifference had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdisambiguate had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdraw had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstencode had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstepsnormalize had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstequal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstequivalent had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstinfo had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstintersect had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstinvert had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstisomorphic had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstmap had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstminimize had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstprint had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstproject had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstprune had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstpush had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrandgen had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrelabel had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreplace had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreverse had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreweight had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrmepsilon had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstshortestdistance had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstshortestpath had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstsymbols had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstsynchronize had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fsttopsort had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstunion had a zero exit code or showed the expected version - 0 of 37 passed binary check by having a zero exit code. - 0 of 37 passed binary check by having the new version present in output. - found 1.6.8 with grep in /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8 - directory tree listing: https://gist.github.com/12e73cab8efbc1c63a2ba5e087454914 - du listing: https://gist.github.com/0fad2edab1e90571b66bb61e3fe3b01e --- pkgs/development/libraries/openfst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 1ab6661db5bb..05370ad4a0bd 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2"; + sha256 = "1ngak7qwanf8n1gqghh7snjl4lsp6xhks4y00b16isrm4rk3cnms"; }; meta = { description = "Library for working with finite-state transducers"; From 63433025ae211c240eaeca2b9899414900058875 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 08:02:34 -0700 Subject: [PATCH 221/312] mate.mate-user-guide: 1.20.0 -> 1.20.1 (#42480) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-user-guide/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/69230e142f75a0bf18525c97d28a5fae - du listing: https://gist.github.com/82fdc8e01e8e7a7c1fc4250a582e480a --- pkgs/desktops/mate/mate-user-guide/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 55cd82eecdc7..4d878e224967 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-user-guide-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2"; + sha256 = "1k99cjg54wlipy5bfiv6v6za6gdzmilfvlvb0ingv4p51jp4iddr"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; From 03b1e67957e72ae1679b0600a19a0ef9f07f8544 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 08:05:04 -0700 Subject: [PATCH 222/312] mopidy-iris: 3.21.1 -> 3.21.3 (#42474) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 3.21.3 with grep in /nix/store/qb6067h8y8p8y7kqkmdk308a494milyw-Mopidy-Iris-3.21.3 - directory tree listing: https://gist.github.com/e0c3564e49b2cec4b30d98ec42723bff - du listing: https://gist.github.com/a127f023f22f9a2abd69c2dd0ff0c71b --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 220ec80834ab..a2d35f382b98 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.21.1"; + version = "3.21.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "10d97rkqk5qbrninrahn0gr90yd47ivw2zafb24sp7a2g0mm07md"; + sha256 = "0gp51zz5qr93w0h14m1blmjnlgmilyb15lw2m75varslw1ar7vlg"; }; propagatedBuildInputs = [ From 858491857e6dd322dbbd20b02198813aff42dc57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 08:05:37 -0700 Subject: [PATCH 223/312] mate.mate-session-manager: 1.20.0 -> 1.20.1 (#42481) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-session-manager/versions. These checks were done: - built on NixOS - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-properties passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-save passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-inhibit passed the binary check. - Warning: no invocation of /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-wm had a zero exit code or showed the expected version - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-wrapped passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-properties-wrapped passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-save-wrapped passed the binary check. - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-inhibit-wrapped passed the binary check. - Warning: no invocation of /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-wm-wrapped had a zero exit code or showed the expected version - 8 of 10 passed binary check by having a zero exit code. - 1 of 10 passed binary check by having the new version present in output. - found 1.20.1 with grep in /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1 - directory tree listing: https://gist.github.com/f036604f75bea4aed0093a9ca8eb6f0a - du listing: https://gist.github.com/1083d12fd4033f9091a0ce334f09c1e4 --- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 97c80cdc2e4e..47657375bbab 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g"; + sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5"; }; nativeBuildInputs = [ From 66350c0e18b0865020a6994ca66687990b134264 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 08:06:03 -0700 Subject: [PATCH 224/312] mate.mate-screensaver: 1.20.0 -> 1.20.1 (#42483) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-screensaver/versions. These checks were done: - built on NixOS - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver passed the binary check. - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver-command passed the binary check. - Warning: no invocation of /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver-preferences had a zero exit code or showed the expected version - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-wrapped passed the binary check. - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-command-wrapped passed the binary check. - Warning: no invocation of /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-preferences-wrapped had a zero exit code or showed the expected version - 4 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 1.20.1 with grep in /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1 - directory tree listing: https://gist.github.com/b700040ccf6edd3df78a2613f8827d45 - du listing: https://gist.github.com/cb5e756e8dc86af9c065a3b8545355f6 --- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 3b5d303816ba..3289ff5081b5 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9"; + sha256 = "1mcr2915wymwjy55m2z0l6b9dszabbv0my0xxsa1fb8xkr4hk4qh"; }; nativeBuildInputs = [ From 14ca98e51e41dfa919f27a550b44d323f2d9900b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 27 Jun 2018 17:18:49 +0200 Subject: [PATCH 225/312] grafana: 5.1.4 -> 5.2.0, replace hard coded version (#42653) Replaced the hard coded version with the packaged version and updated the source URL which changed with the latest release. --- pkgs/servers/monitoring/grafana/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 5e3d118b2f3d..bf97ed34a0f0 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.4"; + version = "5.2.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,15 +9,21 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "09bpijjm7cm4p5ci04ihq55fy5zwpdcld791vdpk6m91ixpab2zc"; + sha256 = "0ybnah8ziyawmmwrvm327xvr6cjbzgblf5f7qwmz6lk7irh8d9ra"; }; srcStatic = fetchurl { - url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0ygfq4my3bdqs942l31w0695a6rwyrwq7jr23g0vgaqadamgbgkg"; + url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; + sha256 = "0ir9dhwm6h4673ic4pwhfwmg6jz8m8ia98cjkr9b4c68yrs1dv5j"; }; + postPatch = '' + substituteInPlace pkg/cmd/grafana-server/main.go \ + --replace 'var version = "5.0.0"' 'var version = "${version}"' + ''; + preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; + postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana From cfbe54cc8c17ec61060134c6e8065e0f42fb0a65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 10:00:43 -0700 Subject: [PATCH 226/312] libcouchbase: 2.9.0 -> 2.9.2 (#42493) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions. These checks were done: - built on NixOS - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-cat passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-create passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-observe passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-observe-seqno passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-incr passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-decr passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-mcflush passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-hash passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-lock passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-unlock passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-rm passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-stats passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-version passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-verbosity passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-view passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-n1ql passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-admin passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-ping passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-bucket-create passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-bucket-delete passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-bucket-flush passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-connstr passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-write-config passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-strerror passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-touch passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-role-list passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-user-list passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-user-upsert passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-user-delete passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-watch passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-pillowfight passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-n1qlback passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-subdoc passed the binary check. - /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2/bin/cbc-proxy passed the binary check. - 35 of 35 passed binary check by having a zero exit code. - 0 of 35 passed binary check by having the new version present in output. - found 2.9.2 with grep in /nix/store/j1xjdfglp6b50r4qdl2mw7iqkgm5wanc-libcouchbase-2.9.2 - directory tree listing: https://gist.github.com/f787ea76774579a3e9fed49a266f79fd - du listing: https://gist.github.com/0dc50f692e5aeeeb2645507f07fc3294 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 8474b387d851..6531a4cd9ed4 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "12s2iw4akil3hlvsccns7qw2c90yw5h67zj3wq03q938w8xcw0d0"; + sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From d4f62f651f6363bbafb43ea7fc0034cb552f211e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 10:02:19 -0700 Subject: [PATCH 227/312] gromacs: 2018.1 -> 2018.2 (#42504) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gromacs/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/GMXRC had a zero exit code or showed the expected version - /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/GMXRC.bash passed the binary check. - /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/GMXRC.zsh passed the binary check. - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/GMXRC.csh had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/demux.pl had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/xplor2gmx.pl had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/gmx-completion.bash had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/gmx-completion-gmx.bash had a zero exit code or showed the expected version - /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2/bin/gmx passed the binary check. - 3 of 9 passed binary check by having a zero exit code. - 0 of 9 passed binary check by having the new version present in output. - found 2018.2 with grep in /nix/store/illh3rp28ipz35z0wipsfc18z4m03sah-gromacs-2018.2 - directory tree listing: https://gist.github.com/1679f0362dfcc7299a6d5b8d9e76c14e - du listing: https://gist.github.com/2f848bb0fe181676c17b61a9d5a94953 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 11087846e05c..295e726c679d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2018.1"; + name = "gromacs-2018.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz"; - sha256 = "1k85sz0b9rmq00g58v22y9v671gsa512sjivx3n3yclr0hs36dad"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz"; + sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab"; }; buildInputs = [cmake fftw] From b5337b357ffe1e54286d5a70e8c447bac935abec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 10:03:42 -0700 Subject: [PATCH 228/312] gzdoom: 3.4.0 -> 3.4.1 (#42499) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/2imdm0m7wchvwgg3r2m3xm5115iq681w-gzdoom-3.4.1/bin/gzdoom had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.4.1 with grep in /nix/store/2imdm0m7wchvwgg3r2m3xm5115iq681w-gzdoom-3.4.1 - directory tree listing: https://gist.github.com/af5b88ddc00326642398bae9d65d3714 - du listing: https://gist.github.com/e85a153098c517727519102b6c1134a8 --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 4115dccf577e..df1dd47905e4 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "09400w0xpw6sk593c0fr6m9qmgn6n5r1qdardizim6m0r5ki565i"; + sha256 = "1d12j6jl3bwarjwri0kjagxzi89s3413drinssgndlvmadd69sx4"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 0d9112f01ae4b5398c6bd487c0ac4dc5e6c840f6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 13:29:55 -0400 Subject: [PATCH 229/312] build-gradle-app.nix: mark unfree Forgot about this. It needs android-sdk-license & build products should fail when allowUnfree = false. --- pkgs/development/mobile/androidenv/build-gradle-app.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix index 1ca51fae1c29..e7708a522ba8 100644 --- a/pkgs/development/mobile/androidenv/build-gradle-app.nix +++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix @@ -101,4 +101,8 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; + + meta = { + license = stdenv.lib.licenses.unfree + }; } // builtins.removeAttrs args ["name" "mavenDeps"]) From e3475f34069d3ce37b9dd8f42def1766a1b99613 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 13:30:16 -0400 Subject: [PATCH 230/312] build-gradle-app.nix: fix eval Sorry, typo. --- pkgs/development/mobile/androidenv/build-gradle-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix index e7708a522ba8..d6a391463246 100644 --- a/pkgs/development/mobile/androidenv/build-gradle-app.nix +++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation ({ ''; meta = { - license = stdenv.lib.licenses.unfree + license = stdenv.lib.licenses.unfree; }; } // builtins.removeAttrs args ["name" "mavenDeps"]) From ea18919b359d79571b6c4d43da45efed566127dd Mon Sep 17 00:00:00 2001 From: Jesper Date: Wed, 27 Jun 2018 20:03:11 +0200 Subject: [PATCH 231/312] rclone: 1.41 -> 1.42 (#42652) --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 405ff2fde735..683eeaf0b6ae 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.41"; + version = "1.42"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; + sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj"; }; outputs = [ "bin" "out" "man" ]; From 916dc592d490d12324d69c3383548ca07ccfb2dc Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Wed, 27 Jun 2018 18:08:03 +0000 Subject: [PATCH 232/312] tvbrowser-bin: init at 4.0.1 (#42620) --- pkgs/applications/misc/tvbrowser/bin.nix | 56 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/misc/tvbrowser/bin.nix diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix new file mode 100644 index 000000000000..38865ca4f3d9 --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: + +let + desktopItem = makeDesktopItem { + name = "tvbrowser"; + exec = "tvbrowser"; + icon = "tvbrowser"; + comment = "Themeable and easy to use TV Guide"; + desktopName = "TV-Browser"; + genericName = "Electronic TV Program Guide"; + categories = "AudioVideo;TV;Java;"; + startupNotify = "true"; + extraEntries = '' + StartupWMClass=tvbrowser-TVBrowser + ''; + }; + +in stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.0.1"; + name = "${pname}-bin-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; + sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/java/${pname} + cp -R * $out/share/java/${pname} + rm $out/share/java/${pname}/${pname}.{sh,desktop} + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ + --run "cd $out/share/java/${pname}" + ''; + + meta = with stdenv.lib; { + description = "Electronic TV Program Guide"; + homepage = https://www.tvbrowser.org/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4997706b20..507f3ee5d845 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21418,6 +21418,8 @@ with pkgs; trufflehog = callPackage ../tools/security/trufflehog { }; + tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; + tvheadend = callPackage ../servers/tvheadend { }; ums = callPackage ../servers/ums { }; From 4a59bc4c439b0957b5f23ffa54a204bad0e8467a Mon Sep 17 00:00:00 2001 From: Jesper Date: Wed, 27 Jun 2018 20:13:51 +0200 Subject: [PATCH 233/312] bfs: 1.2.1 -> 1.2.2 (#42662) --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 2e4133124c11..3f618301a864 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx"; + sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g"; }; # Disable fstype test, tries to read /etc/mtab From 49008f9c71ace2e70ba97604bad4119f2ee25863 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 27 Jun 2018 15:20:40 -0300 Subject: [PATCH 234/312] guile-reader: init at 0.6.2 --- .../guile-modules/guile-reader/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/guile-modules/guile-reader/default.nix diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix new file mode 100644 index 000000000000..010c523507fd --- /dev/null +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch, pkgconfig +, gperf, guile, guile-lib, libffi }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "guile-reader-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz"; + sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; + }; + + patches = [ + (fetchpatch { + name = "0001-fix-prototypes.patch"; + url = https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31; + sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb"; + }) ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf guile guile-lib libffi ]; + + GUILE_SITE="${guile-lib}/share/guile/site"; + + configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; + + meta = with stdenv.lib; { + description = "A simple framework for building readers for GNU Guile"; + longDescription = '' + Guile-Reader is a simple framework for building readers for GNU + Guile. + + The idea is to make it easy to build procedures that extend + Guile's read procedure. Readers supporting various syntax + variants can easily be written, possibly by re-using existing + "token readers" of a standard Scheme readers. For example, it + is used to implement Skribilo's R5RS-derived document syntax. + ''; + homepage = https://www.gnu.org/software/guile-reader; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 507f3ee5d845..d5b5b45047e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7645,6 +7645,8 @@ with pkgs; guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; + guile-reader = callPackage ../development/guile-modules/guile-reader { }; + guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; From 8f5f3874751493e33f0eb122c006ede3ad0c8751 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 27 Jun 2018 15:22:03 -0300 Subject: [PATCH 235/312] skribilo: init at 0.9.4 --- pkgs/tools/typesetting/skribilo/default.nix | 58 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/typesetting/skribilo/default.nix diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix new file mode 100644 index 000000000000..355d7a055e8f --- /dev/null +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, gettext +, guile, guile-reader, guile-lib +, ploticus, imagemagick +, ghostscript, transfig +, enableEmacs ? false, emacs ? null +, enableLout ? true, lout ? null +, enableTex ? true, tex ? null +, makeWrapper }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "skribilo-${version}"; + version = "0.9.4"; + + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz"; + sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ] + ++ optional enableEmacs emacs + ++ optional enableLout lout + ++ optional enableTex tex; + + propagatedBuildInputs = [ guile-reader guile-lib ]; + + postInstall = '' + wrapProgram $out/bin/skribilo \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" + ''; + + meta = { + description = "The Ultimate Document Programming Framework"; + longDescription = '' + Skribilo is a free document production tool that takes a + structured document representation as its input and renders that + document in a variety of output formats: HTML and Info for + on-line browsing, and Lout and LaTeX for high-quality hard + copies. + + The input document can use Skribilo's markup language to provide + information about the document's structure, which is similar to + HTML or LaTeX and does not require expertise. Alternatively, it + can use a simpler, "markup-less" format that borrows from Emacs' + outline mode and from other conventions used in emails, Usenet + and text. + ''; + homepage = https://www.nongnu.org/skribilo/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: Better Emacs and TeX integration diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b5b45047e6..ddba989f04cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5034,6 +5034,10 @@ with pkgs; sipcalc = callPackage ../tools/networking/sipcalc { }; + skribilo = callPackage ../tools/typesetting/skribilo { + tex = texlive.combined.scheme-small; + }; + sleuthkit = callPackage ../tools/system/sleuthkit {}; sleepyhead = callPackage ../applications/misc/sleepyhead {}; From b96c0e6d7b57cdc9caaf6f4fae8e1ab0dfec11cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 27 Jun 2018 21:02:47 +0200 Subject: [PATCH 236/312] ocaml-top: 1.1.4 -> 1.1.5 (#42664) --- pkgs/development/tools/ocaml/ocaml-top/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e7d8b163420c..744a136c9ef2 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -2,11 +2,12 @@ , ocamlPackages , jbuilder }: -stdenv.mkDerivation { - name = "ocaml-top-1.1.4"; +stdenv.mkDerivation rec { + version = "1.1.5"; + name = "ocaml-top-${version}"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz; - sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j"; + url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz"; + sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv"; }; buildInputs = [ ncurses jbuilder ] From f188b63b6a295d627eb5bdea27fc462bc9c1b2c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 12:03:25 -0700 Subject: [PATCH 237/312] units: 2.16 -> 2.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/units/versions. These checks were done: - built on NixOS - /nix/store/31sfwbmnw4vpchikbc0fv88hwqa6j7pk-units-2.17/bin/units passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.17 with grep in /nix/store/31sfwbmnw4vpchikbc0fv88hwqa6j7pk-units-2.17 - directory tree listing: https://gist.github.com/9398a46bc8272d0edd66c877ba0cd160 - du listing: https://gist.github.com/d78a308aacca7211f8470bf140a8c773 --- pkgs/tools/misc/units/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index f66f6c3642e7..23e28c3c286a 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw"; + sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; }; buildInputs = [ readline ]; From 3210dd3039798a10884925cae98ef3b2a4c10703 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 15:35:07 -0400 Subject: [PATCH 238/312] generators: add PLIST handling /cc @LnL7 @3noch --- lib/generators.nix | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/lib/generators.nix b/lib/generators.nix index c09384c00f57..aab4498f9c64 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -175,4 +175,52 @@ rec { else "<λ:{${showFnas}}>" else abort "toPretty: should never happen (v = ${v})"; + # PLIST handling + + toPLIST = x: '' + + + + '' + pprExpr "" x + + "\n"; + + pprExpr = ind: x: with builtins; + if isNull x then "" else + if isBool x then pprBool ind x else + if isInt x then pprInt ind x else + if isString x then pprStr ind x else + if isList x then pprList ind x else + if isAttrs x then pprAttrs ind x else + throw "invalid plist type"; + + pprLiteral = ind: x: ind + x; + + pprBool = ind: x: pprLiteral ind (if x then "" else ""); + pprInt = ind: x: pprLiteral ind "${toString x}"; + pprStr = ind: x: pprLiteral ind "${x}"; + pprKey = ind: x: pprLiteral ind "${x}"; + + pprIndent = ind: pprExpr "\t${ind}"; + + pprItem = ind: libStr.concatMapStringsSep "\n" (pprIndent ind); + + pprList = ind: x: libStr.concatStringsSep "\n" [ + (pprLiteral ind "") + (pprItem ind x) + (pprLiteral ind "") + ]; + + pprAttrs = ind: x: libStr.concatStringsSep "\n" [ + (pprLiteral ind "") + (pprAttr ind x) + (pprLiteral ind "") + ]; + + attrFilter = name: value: name != "_module" && value != null; + + pprAttr = ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList (name: value: lib.optional (attrFilter name value) [ + (pprKey "\t${ind}" name) + (pprExpr "\t${ind}" value) + ]) x)); + } From c672e37f4acf7e5bb8a794a0b342e1c693387f8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 15:36:00 -0400 Subject: [PATCH 239/312] xcbuild: rework to use lib.PLIST This is a good way to test that plist works. Sorry for the large diff. There are a bunch of cleanups in here that needed to be done. Should make it possible to use in cross compilation. --- pkgs/development/tools/xcbuild/default.nix | 6 +- pkgs/development/tools/xcbuild/platform.nix | 34 ++--- pkgs/development/tools/xcbuild/sdk.nix | 22 ++- pkgs/development/tools/xcbuild/toolchain.nix | 144 ++++++------------- pkgs/development/tools/xcbuild/wrapper.nix | 31 ++-- pkgs/top-level/all-packages.nix | 3 +- 6 files changed, 83 insertions(+), 157 deletions(-) diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index b7b14128048b..3f7b21be005d 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }: +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng +, CoreServices, CoreGraphics, ImageIO, ninja }: let googletest = fetchFromGitHub { @@ -17,7 +18,8 @@ let in stdenv.mkDerivation rec { name = "xcbuild-${version}"; - # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, + # Once a version is released that includes + # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, # we can stop doing this -pre thing. version = "0.1.2-pre"; diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index a36c4f4bf806..e3fb83edc674 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -1,7 +1,9 @@ -{ stdenv, sdk, writeText, platformName, xcbuild }: +{ runCommand, lib, sdk, platformName, writeText }: let + inherit (lib.generators) toPLIST; + Info = { CFBundleIdentifier = platformName; Type = "Platform"; @@ -283,24 +285,14 @@ let in -stdenv.mkDerivation { - name = "MacOSX.platform"; - buildInputs = [ xcbuild ]; - buildCommand = '' - mkdir -p $out/ - cd $out/ +runCommand "MacOSX.platform" {} '' + install -D ${writeText "Info.plist" (toPLIST Info)} $out/Info.plist + install -D ${writeText "version.plist" (toPLIST Version)} $out/version.plist + install -D ${writeText "Architectures.xcspec" (toPLIST Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec + install -D ${writeText "PackageTypes.xcspec" (toPLIST PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec + install -D ${writeText "ProductTypes.xcspec" (toPLIST ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec - 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 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/ - cp -r ${sdk} ${sdk.name} - ''; -} + mkdir -p $out/Developer/SDKs/ + cd $out/Developer/SDKs/ + cp -r ${sdk} ${sdk.name} +'' diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 87bbedd57880..2d43347da03d 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,6 +1,8 @@ -{ stdenv, writeText, toolchainName, sdkName, xcbuild }: +{ runCommand, lib, toolchainName, sdkName, writeText }: let + inherit (lib.generators) toPLIST; + # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. version = "10.10"; @@ -19,17 +21,9 @@ let }; in -stdenv.mkDerivation { - name = "MacOSX${version}.sdk"; +runCommand "MacOSX${version}.sdk" { inherit version; - - buildInputs = [ xcbuild ]; - - buildCommand = '' - mkdir -p $out/ - plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} - - mkdir -p $out/System/Library/CoreServices/ - plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} - ''; -} +} '' + install -D ${writeText "SDKSettings.plist" (toPLIST SDKSettings)} $out/SDKSettings.plist + install -D ${writeText "SystemVersion.plist" (toPLIST SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist +'' diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 9e34360909f9..d8c80b53831c 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,16 +1,18 @@ -{stdenv, writeText, toolchainName, xcbuild, fetchurl -, llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper -, xib2nib}: +{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv +, buildPackages, lib, writeText }: let + inherit (lib) getBin optionalString; + inherit (lib.generators) toPLIST; + ToolchainInfo = { Identifier = toolchainName; }; - # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and - # this is just a tiny script so I'm not going to bother + # We could pull this out of developer_cmds but it adds an annoying + # loop if we want to bootstrap and this is just a tiny script so I'm + # not going to bother. mkdep-darwin-src = fetchurl { url = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh"; sha256 = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541"; @@ -18,106 +20,44 @@ let }; in -stdenv.mkDerivation { - name = "nixpkgs.xctoolchain"; - buildInputs = [ xcbuild makeWrapper ]; +runCommand "nixpkgs.xctoolchain" { + nativeBuildInputs = [ makeWrapper ]; +} ('' + mkdir -p $out + install -D ${writeText "ToolchainInfo.plist" (toPLIST ToolchainInfo)} $out/ToolchainInfo.plist - ## cctools should build on Linux but it doesn't currently + 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 - buildCommand = '' - mkdir -p $out - plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + for bin in ${getBin stdenv.cc}/bin/*; do + ln -s $bin $out/usr/bin + done - mkdir -p $out/usr/include - mkdir -p $out/usr/lib - mkdir -p $out/usr/libexec - mkdir -p $out/usr/share + for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do + if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then + ln -s $bin $out/usr/bin + fi + done - mkdir -p $out/usr/bin - cd $out/usr/bin - 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 ${buildPackages.yacc}/bin/yacc $out/usr/bin/yacc + ln -s ${buildPackages.yacc}/bin/bison $out/usr/bin/bison + ln -s ${buildPackages.flex}/bin/flex $out/usr/bin/flex + ln -s ${buildPackages.flex}/bin/flex++ $out/usr/bin/flex++ + ln -s $out/bin/flex $out/usr/bin/lex - 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 ${buildPackages.m4}/bin/m4 $out/usr/bin/m4 + ln -s $out/usr/bin/m4 $out/usr/bin/gm4 - ln -s ${yacc}/bin/yacc - ln -s ${yacc}/bin/bison - ln -s ${flex}/bin/flex - ln -s ${flex}/bin/flex++ + ln -s ${buildPackages.unifdef}/bin/unifdef $out/usr/bin/unifdef + ln -s ${buildPackages.unifdef}/bin/unifdefall $out/usr/bin/unifdefall - 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 ${gperf}/bin/gperf - ln -s ${indent}/bin/indent - 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 - - ln -s ${xib2nib}/bin/ibtool - '' + - # No point including the entire gcc closure if we don't already have it - (if stdenv.cc.isClang then '' - ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov - ln -s ${mkdep-darwin-src} mkdep - '' else '' - ln -s ${gcc}/bin/gcov - ln -s ${gcc}/bin/mkdep - ''); -} - -# other commands in /bin/ -# asa -# cmpdylib (in cctools) -# ctf_insert (in cctools) -# dwarfdump -# lorder -# rebase -# rpcgen (in developer_cmds) -# what - - -# swift: see #11463 -# swift -# swift-compress -# swift-demangle -# swift-stdlib-tool -# swift-update -# swiftc + ln -s ${buildPackages.gperf}/bin/gperf $out/usr/bin/gperf + ln -s ${buildPackages.indent}/bin/indent $out/usr/bin/indent + ln -s ${buildPackages.ctags}/bin/ctags $out/usr/bin/ctags +'' + optionalString stdenv.isDarwin '' + ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $out/usr/bin + ln -s ${mkdep-darwin-src} $out/usr/bin/mkdep +'') diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 06c48ec0a73f..cfa855e23cd8 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,5 @@ -{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics -, cctools, bootstrap_cmds, binutils}: +{ stdenv, buildPackages, makeWrapper, writeText, runCommand +, CoreServices, ImageIO, CoreGraphics }: let @@ -7,20 +7,20 @@ let platformName = "com.apple.platform.macosx"; sdkName = "macosx10.10"; - xcbuild = callPackage ./default.nix { + xcbuild = buildPackages.callPackage ./default.nix { inherit CoreServices ImageIO CoreGraphics; }; - toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv; + toolchain = buildPackages.callPackage ./toolchain.nix { + inherit toolchainName; }; - sdk = callPackage ./sdk.nix { - inherit toolchainName sdkName xcbuild; + sdk = buildPackages.callPackage ./sdk.nix { + inherit toolchainName sdkName; }; - platform = callPackage ./platform.nix { - inherit sdk platformName xcbuild; + platform = buildPackages.callPackage ./platform.nix { + inherit sdk platformName; }; xcconfig = writeText "nix.xcconfig" '' @@ -32,7 +32,7 @@ in stdenv.mkDerivation { name = "xcbuild-wrapper-${xcbuild.version}"; - buildInputs = [ xcbuild makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; setupHook = ./setup-hook.sh; @@ -40,22 +40,21 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - cd $out/bin/ for file in ${xcbuild}/bin/*; do - ln -s $file + ln -s $file $out/bin done - mkdir $out/usr + mkdir -p $out/usr ln -s $out/bin $out/usr/bin - mkdir -p $out/Library/Xcode/ + mkdir -p $out/Library/Xcode ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications - mkdir -p $out/Platforms/ + mkdir -p $out/Platforms ln -s ${platform} $out/Platforms/nixpkgs.platform - mkdir -p $out/Toolchains/ + mkdir -p $out/Toolchains ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain wrapProgram $out/bin/xcodebuild \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4997706b20..d358fe37106c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8570,8 +8570,7 @@ with pkgs; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - inherit (darwin) cctools bootstrap_cmds binutils; - stdenv = clangStdenv; + stdenv = buildPackages.clangStdenv; }; xmlindent = callPackage ../development/web/xmlindent {}; From 3dd8b03da9e6def049d81a8e9fbdf482e8acc877 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Wed, 27 Jun 2018 20:55:00 +0200 Subject: [PATCH 240/312] pythonPackages.flask-restful: disable broken test --- pkgs/development/python-modules/flask-restful/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index c54c015af123..ec7e65aa4e43 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { patchPhase = if isPy3k then '' rm tests/test_crypto.py tests/test_paging.py '' else null; +# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0 + preCheck = '' + substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals" + ''; buildInputs = [ nose mock blinker ]; propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; From a3a31fcb22f2714ac517805897d55ffcfe7d47e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 13:11:04 -0700 Subject: [PATCH 241/312] safeeyes: 2.0.5 -> 2.0.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/safeeyes/versions. These checks were done: - built on NixOS - /nix/store/53h69rsf2wws7mdq1k7fq37crp4lx77y-safeeyes-2.0.6/bin/safeeyes passed the binary check. - Warning: no invocation of /nix/store/53h69rsf2wws7mdq1k7fq37crp4lx77y-safeeyes-2.0.6/bin/..safeeyes-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/53h69rsf2wws7mdq1k7fq37crp4lx77y-safeeyes-2.0.6/bin/.safeeyes-wrapped had a zero exit code or showed the expected version - 1 of 3 passed binary check by having a zero exit code. - 0 of 3 passed binary check by having the new version present in output. - found 2.0.6 with grep in /nix/store/53h69rsf2wws7mdq1k7fq37crp4lx77y-safeeyes-2.0.6 - directory tree listing: https://gist.github.com/505a88852b7a491f174c5ea908f29b0b - du listing: https://gist.github.com/84c95c9fa3f5e9999c04687baf8cdf77 --- pkgs/applications/misc/safeeyes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d216a695a3c5..e0c5946d564f 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.5"; + version = "2.0.6"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1q52ncqn18wb3d42dzsm7lh301w6g053a685i1cnismvp86amvfl"; + sha256 = "0s14pxicgq33srvhf6bvfq48wv3z4rlsmzkccz4ky9vh3gfx7zka"; }; buildInputs = [ From fce8f26af6ef8209c7d282938e9457438746841b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 27 Jun 2018 13:12:57 -0700 Subject: [PATCH 242/312] treewide: http -> https (#42665) --- doc/languages-frameworks/python.section.md | 4 +-- .../applications/audio/cdparanoia/default.nix | 2 +- .../applications/audio/rosegarden/default.nix | 2 +- .../audio/vorbis-tools/default.nix | 2 +- pkgs/applications/audio/ympd/default.nix | 2 +- .../editors/emacs-modes/scala-mode/v1.nix | 2 +- pkgs/applications/editors/scite/default.nix | 2 +- pkgs/applications/misc/vcal/default.nix | 2 +- pkgs/applications/misc/welle-io/default.nix | 2 +- pkgs/applications/misc/xneur/default.nix | 2 +- .../networking/p2p/deluge/default.nix | 2 +- .../networking/sync/rclone/default.nix | 2 +- .../networking/syncplay/default.nix | 2 +- .../networking/vnstat/default.nix | 2 +- pkgs/applications/networking/znc/default.nix | 2 +- pkgs/applications/office/scribus/default.nix | 2 +- .../science/logic/workcraft/default.nix | 2 +- .../version-management/srcml/default.nix | 2 +- .../window-managers/weston/default.nix | 2 +- pkgs/development/compilers/ponyc/default.nix | 2 +- pkgs/development/compilers/scala/2.10.nix | 2 +- pkgs/development/compilers/scala/default.nix | 2 +- .../interpreters/rakudo/default.nix | 2 +- .../interpreters/rascal/default.nix | 2 +- pkgs/development/interpreters/red/default.nix | 2 +- .../interpreters/renpy/default.nix | 2 +- pkgs/development/libraries/ntdb/default.nix | 2 +- .../development/libraries/rocksdb/default.nix | 2 +- .../libraries/rubberband/default.nix | 2 +- .../libraries/speexdsp/default.nix | 2 +- pkgs/development/libraries/talloc/default.nix | 2 +- pkgs/development/libraries/tdb/default.nix | 2 +- .../libraries/telepathy/glib/default.nix | 2 +- pkgs/development/libraries/tevent/default.nix | 2 +- .../libraries/vo-amrwbenc/default.nix | 2 +- .../libraries/vulkan-loader/default.nix | 2 +- pkgs/development/libraries/wayland/1.9.nix | 2 +- .../libraries/wayland/protocols.nix | 2 +- .../libraries/xapian/tools/omega/default.nix | 2 +- .../python-modules/biopython/default.nix | 4 +-- .../python-modules/blinker/default.nix | 2 +- .../python-modules/bokeh/default.nix | 2 +- .../python-modules/dulwich/default.nix | 2 +- .../flask-autoindex/default.nix | 2 +- .../python-modules/hdbscan/default.nix | 2 +- .../python-modules/joblib/default.nix | 2 +- .../python-modules/mt-940/default.nix | 2 +- .../python-modules/pylint/default.nix | 2 +- .../python-modules/pymongo/default.nix | 2 +- .../python-modules/pyro/default.nix | 2 +- .../python-modules/pytest-timeout/default.nix | 2 +- .../python-modules/python-openid/default.nix | 2 +- .../python-modules/python-stdnum/default.nix | 2 +- .../python-modules/pytorch/default.nix | 2 +- .../python-modules/restview/default.nix | 4 +-- .../python-modules/s3fs/default.nix | 2 +- .../python-modules/scipy/default.nix | 2 +- .../python-modules/scrapy/default.nix | 2 +- .../python-modules/sockjs-tornado/default.nix | 2 +- .../python-modules/spake2/default.nix | 2 +- .../python-modules/toolz/default.nix | 4 +-- .../python-modules/torchvision/default.nix | 2 +- .../python-modules/twisted/default.nix | 2 +- .../python-modules/uncertainties/default.nix | 2 +- .../python-modules/webassets/default.nix | 2 +- .../python-modules/whoosh/default.nix | 2 +- .../python-modules/xstatic-jquery/default.nix | 2 +- .../python-modules/zc_lockfile/default.nix | 2 +- .../development/tools/analysis/rr/default.nix | 2 +- .../tools/build-managers/sbt/default.nix | 2 +- .../development/tools/misc/strace/default.nix | 2 +- pkgs/development/tools/valadoc/default.nix | 2 +- pkgs/games/spring/default.nix | 2 +- pkgs/misc/urbit/default.nix | 2 +- pkgs/misc/vim-plugins/default.nix | 2 +- .../vim2nix/additional-nix-code/youcompleteme | 2 +- pkgs/servers/kippo/default.nix | 2 +- pkgs/servers/misc/taskserver/default.nix | 2 +- pkgs/servers/monitoring/zabbix/2.0.nix | 4 +-- pkgs/servers/monitoring/zabbix/2.2.nix | 4 +-- pkgs/servers/monitoring/zabbix/3.4.nix | 2 +- pkgs/servers/monitoring/zipkin/default.nix | 2 +- pkgs/servers/nosql/redis/default.nix | 2 +- pkgs/servers/samba/3.x.nix | 2 +- pkgs/servers/samba/4.x.nix | 2 +- pkgs/servers/sql/postgresql/pgtap/default.nix | 2 +- pkgs/servers/tt-rss/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 2 +- pkgs/tools/X11/vdpauinfo/default.nix | 2 +- pkgs/tools/X11/xdotool/default.nix | 2 +- pkgs/tools/compression/rzip/default.nix | 2 +- pkgs/tools/misc/appdata-tools/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- pkgs/tools/misc/tlp/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 18 ++++++------ pkgs/top-level/python-packages.nix | 28 +++++++++---------- 97 files changed, 124 insertions(+), 124 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7d70ce4a2abf..4daf488bb28f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -200,7 +200,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -245,7 +245,7 @@ with import {}; doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; }; }; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 760b04bef005..96330d4e9557 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/paranoia; + homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index d881afa7f5f0..e57d85de05a9 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.rosegardenmusic.com/; + homepage = https://www.rosegardenmusic.com/; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 6b9af119859e..f815ac02e6e5 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index c3e8efae7fe9..2e335e6b10e9 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = http://www.ympd.org; + homepage = https://www.ympd.org; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix index f82d467066a6..7867226ff806 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An Emacs mode for editing Scala code"; - homepage = http://www.scala-lang.org/node/354; + homepage = https://www.scala-lang.org/node/354; # non-copyleft, BSD-style license = "permissive"; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 76a00c44ebbe..e9b6f7387632 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scintilla.org/SciTE.html; + homepage = https://www.scintilla.org/SciTE.html; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 9225bd86492e..c826bb1dc951 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parser for VCalendar and ICalendar files, usable from the command line"; - homepage = http://waynemorrison.com/software/; + homepage = https://waynemorrison.com/software/; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index 143ec518ac51..27376f4db81c 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A DAB/DAB+ Software Radio"; - homepage = http://www.welle.io/; + homepage = https://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ca0d7775ecef..ff7c6a9e9767 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; - homepage = http://xneur.ru; + homepage = https://xneur.ru; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7ca1e595c35d..ca4014ed31c3 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -31,7 +31,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://deluge-torrent.org; + homepage = https://deluge-torrent.org; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 683eeaf0b6ae..337c166a79ac 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = http://rclone.org; + homepage = https://rclone.org; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4eecf7f4a1f8..029158caf4b5 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://syncplay.pl/; + homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index e38ba36b9253..f84058dd4fc3 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = http://humdi.net/vnstat/; + homepage = https://humdi.net/vnstat/; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index d1b333587a68..655962ea5b31 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = http://wiki.znc.in/ZNC; + homepage = https://wiki.znc.in/ZNC; maintainers = with maintainers; [ viric schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a6f0bccec96b..ac1bf18e9999 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = http://www.scribus.net; + homepage = https://www.scribus.net; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 9ae5d75c4577..b677927a8eff 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://workcraft.org/; + homepage = https://workcraft.org/; description = "Framework for interpreted graph modeling, verification and synthesis"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 2da53d1da893..8753d4f6f571 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = http://www.srcml.org; + homepage = https://www.srcml.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 4a15e3236168..298031b8b305 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index cc993af82080..f07f68241794 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec { meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; - homepage = http://www.ponylang.org; + homepage = https://www.ponylang.org; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index bac36d61068d..86b6a942403b 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a25d4f6e6544..92690649bff6 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 83e8f1d00302..1244ad5ecd2e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Perl 6 implementation"; - homepage = "http://www.rakudo.org"; + homepage = https://www.rakudo.org; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra ]; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index b079ff003347..e15e0926aedf 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.rascal-mpl.org/; + homepage = https://www.rascal-mpl.org/; description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 36047759baae..56ff02831741 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ uralbash ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd3; - homepage = http://www.red-lang.org/; + homepage = https://www.red-lang.org/; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 220aa9abe558..4dff7e6974ef 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; - homepage = http://renpy.org/; + homepage = https://renpy.org/; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index d26b15176aa6..a70cba625a89 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The not-so trivial database"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index bb36d942a69b..90389055a415 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://rocksdb.org; + homepage = https://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 364a4d4794a8..c9ba339ae0ea 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = http://www.breakfastquay.com/rubberband/index.html; + homepage = https://www.breakfastquay.com/rubberband/index.html; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index a96e808a97e4..c7f8787c1fda 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - homepage = http://www.speex.org/; + homepage = https://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e8f0d61b2f4f..30d9a38a35df 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d372c61dbe28..dc3c2c157138 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index df5c76abd7cd..9ca2481c3b01 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.python = python2; meta = { - homepage = http://telepathy.freedesktop.org; + homepage = https://telepathy.freedesktop.org; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 154db61894fa..12576eed14ce 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An event system based on the talloc memory management library"; - homepage = http://tevent.samba.org/; + homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index ba6e437ca3c3..9e4ac7e22ca9 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://sourceforge.net/projects/opencore-amr/"; + homepage = https://sourceforge.net/projects/opencore-amr/; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = "stdenv.lib.licenses.apache"; maintainers = [ stdenv.lib.maintainers.Esteth ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b9b18dc79103..0d9bc3ca345a 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 4c6d95e67c0f..efb365958eb8 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index c1065b20e6b4..4bb7cd153cf3 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wayland protocol extensions"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 09c2171945e4..17855011297e 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 8f99c0d75d34..8229c1edce8a 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { applications which address the needs of current and future work in bioinformatics. ''; - homepage = http://biopython.org/wiki/Documentation; + homepage = https://biopython.org/wiki/Documentation; maintainers = with lib.maintainers; [ luispedro ]; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 5dd9d10961bb..d1eef11869a8 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pythonhosted.org/blinker/; + homepage = https://pythonhosted.org/blinker/; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4f9bc3183581..4855a07a479b 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Statistical and novel interactive HTML plots for Python"; - homepage = "http://github.com/bokeh/bokeh"; + homepage = https://github.com/bokeh/bokeh; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 3001b687556b..61b1d0d1cd98 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = http://samba.org/~jelmer/dulwich/; + homepage = https://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index 397d1e03ee82..95e457de81d3 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = http://pythonhosted.org/Flask-AutoIndex/; + homepage = https://pythonhosted.org/Flask-AutoIndex/; }; } diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index e75b04e97923..94b9861daa97 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; - homepage = http://github.com/scikit-learn-contrib/hdbscan; + homepage = https://github.com/scikit-learn-contrib/hdbscan; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index eedbed250a12..1b61863d37a8 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Lightweight pipelining: using Python functions as pipeline jobs"; - homepage = http://pythonhosted.org/joblib/; + homepage = https://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index bab7cc052b9d..9b1a2df48bbb 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = "http://pythonhosted.org/mt-940/"; + homepage = https://pythonhosted.org/mt-940/; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index f6aec993c3c7..c8bd85d5fed1 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.logilab.org/project/pylint; + homepage = https://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 038b12b3a9e7..838adeac8a8e 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix index 3e2f90aa9d30..3a74a1fe6fa7 100644 --- a/pkgs/development/python-modules/pyro/default.nix +++ b/pkgs/development/python-modules/pyro/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = http://pythonhosted.org/Pyro/; + homepage = https://pythonhosted.org/Pyro/; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index d1e40e5037e3..ee62188d505d 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib;{ description = "py.test plugin to abort hanging tests"; - homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix index f25a89c65d44..fee511991d2b 100644 --- a/pkgs/development/python-modules/python-openid/default.nix +++ b/pkgs/development/python-modules/python-openid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; - homepage = http://github.com/openid/python-openid; + homepage = https://github.com/openid/python-openid; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 8e68570c5bfe..2ffb28482f48 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3"; }; meta = { - homepage = http://arthurdejong.org/python-stdnum/; + homepage = https://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index b0ac4e070935..16e7d8a40498 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -62,7 +62,7 @@ in buildPythonPackage rec { meta = { description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 08930ed4d460..0769517db71f 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "ReStructuredText viewer"; - homepage = http://mg.pov.lt/restview/; + homepage = https://mg.pov.lt/restview/; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ koral ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index c605d43888c1..0053b125bcb1 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = http://github.com/dask/s3fs/; + homepage = https://github.com/dask/s3fs/; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5a0bf981684f..5e57dd3f093d 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = http://www.scipy.org/; + homepage = https://www.scipy.org/; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index f33acc79a2bb..35eff76bbf09 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = http://scrapy.org/; + homepage = https://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index eff799e0d014..ad7916856d15 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado ]; meta = with lib; { - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = https://github.com/mrjoes/sockjs-tornado/; description = "SockJS python server implementation on top of Tornado framework"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 08500aeb4ad1..2d2f066eaedc 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPAKE2 password-authenticated key exchange library"; - homepage = "http://github.com/warner/python-spake2"; + homepage = https://github.com/warner/python-spake2; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 0fc14024903e..2a3da903b542 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec{ ''; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = https://github.com/pytoolz/toolz/; description = "List processing tools and functional utilities"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 5dace76c9b2c..0915bc300c54 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "PyTorch vision library"; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4a23a1b88cba..6c679bc9cf40 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index d90ada606321..081108634c2e 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pythonhosted.org/uncertainties/; + homepage = https://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index a5a7957e8ec1..147668da376c 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = https://github.com/miracle2k/webassets/; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 7e2a571b1bba..b0350da63fad 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = "http://bitbucket.org/mchaput/whoosh"; + homepage = https://bitbucket.org/mchaput/whoosh; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index c414e0a070ae..d884f12bdbf1 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = http://jquery.org; + homepage = https://jquery.org; description = "jquery packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index a69f50c8c795..916a6882a17a 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; - homepage = http://www.python.org/pypi/zc.lockfile; + homepage = https://www.python.org/pypi/zc.lockfile; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 01caa59fe4c3..d0d20362236b 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "export HOME=$TMPDIR"; meta = { - homepage = http://rr-project.org/; + homepage = https://rr-project.org/; description = "Records nondeterministic executions and debugs them deterministically"; longDescription = '' rr aspires to be your primary debugging tool, replacing -- well, diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 76d099625626..8db0cc0d54f3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scala-sbt.org/; + homepage = https://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; maintainers = with maintainers; [ nequissimus rickynils ]; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a19fecc9c33a..a5fd8f5cf64d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.io/; + homepage = https://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index 2e2fc1ad9273..8f9087ee3b3a 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "valadoc is a documentation generator for generating API documentation from Vala source code"; - homepage = http://valadoc.org; + homepage = https://valadoc.org; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sternenseemann ]; platforms = with platforms; linux; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9ce5c7db83fb..83a85415664d 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://springrts.com/; + homepage = https://springrts.com/; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 125df39ae8a6..df13c15562dd 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An operating function"; - homepage = http://urbit.org; + homepage = https://urbit.org; license = licenses.mit; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 06047d91b7d5..68d0bb69b343 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2908,7 +2908,7 @@ rec { meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; + homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index d61fdff0f08d..278343dab6e0 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -9,7 +9,7 @@ meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; + homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 554401438705..a9f5ba6f7b2c 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -49,7 +49,7 @@ let postInstall = "$out/bin/twistd --help > /dev/null"; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 466c3873c600..63925d30c644 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; - homepage = http://taskwarrior.org; + homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index da2d1388c469..d3816cf1ecdb 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -65,7 +65,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -82,7 +82,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 1cc604f6491b..bc5556d4bc00 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -77,7 +77,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -94,7 +94,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 332e139f4283..69b3577720f5 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -29,7 +29,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 2925a8f2dc53..4c3479d8662e 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Zipkin distributed tracing system"; - homepage = "http://zipkin.io/"; + homepage = https://zipkin.io/; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4980a6fb2bfd..bf1ccbd06d56 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://redis.io; + homepage = https://redis.io; description = "An open source, advanced key-value store"; license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 91b1c8f95c1c..4d9fc46dcf7f 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; meta = { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; platforms = stdenv.lib.platforms.linux; knownVulnerabilities = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ee14ec6443bf..0ff7f88911f2 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index 1206e50926ed..c6eb4013c5ce 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It can also be used in the xUnit testing style. ''; maintainers = with maintainers; [ willibutz ]; - homepage = http://pgtap.org; + homepage = https://pgtap.org; inherit (postgresql.meta) platforms; }; } diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 6f584bfabd3d..b3714c7a0c28 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; - homepage = http://tt-rss.org; + homepage = https://tt-rss.org; maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 4c728d2e3e79..06f54fd52073 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -29,7 +29,7 @@ xorgserver.overrideAttrs (oldAttrs: { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; - homepage = http://wayland.freedesktop.org/xserver.html; + homepage = https://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index a20b7d69f3dc..ad51b6be51d7 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index f69d5d80649b..59ddac0eca15 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = http://www.semicomplete.com/projects/xdotool/; + homepage = https://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ad1b80410419..8773121e6461 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://rzip.samba.org/; + homepage = https://rzip.samba.org/; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index 54c78874dd2e..7ceafe127932 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~hughsient/appdata; + homepage = https://people.freedesktop.org/~hughsient/appdata; description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index e9ed5c0450af..66ddd0548a8c 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = http://www.rockbox.org; + homepage = https://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu jgeerds ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 91eeb6b0a511..39d3ea1c2086 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced Power Management for Linux"; - homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a6999942e0c6..ef98341c5bac 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.rsyslog.com/; + homepage = https://www.rsyslog.com/; description = "Enhanced syslog implementation"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2018b5065a1c..675c27c23e11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -358,7 +358,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { - homepage = http://sqitch.org/; + homepage = https://sqitch.org/; description = "Sane database change management"; license = stdenv.lib.licenses.mit; }; @@ -2345,7 +2345,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Engine for tidyall, your all-in-one code tidier and validator"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://metacpan.org/release/Code-TidyAll"; + homepage = https://metacpan.org/release/Code-TidyAll; }; }; @@ -9740,7 +9740,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Generate Kwalitee ratings for a distribution"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://cpants.cpanauthors.org"; + homepage = https://cpants.cpanauthors.org; }; }; @@ -10069,7 +10069,7 @@ let self = _self // overrides; _self = with self; { sha256 = "70c5f211ba81982752eae189ca7aea0ea14fb7534449114d0a3d47d96c0d05c4"; }; meta = { - homepage = http://mojolicious.org; + homepage = https://mojolicious.org/; description = "Real-time web framework"; license = with stdenv.lib.licenses; [ artistic2 ]; }; @@ -11895,7 +11895,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Params-ValidationCompiler"; + homepage = https://metacpan.org/release/Params-ValidationCompiler; }; }; @@ -13643,7 +13643,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Type constraints and coercions for Perl"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Specio"; + homepage = https://metacpan.org/release/Specio; }; }; @@ -13658,7 +13658,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Path::Tiny types and coercions for Specio"; license = with stdenv.lib.licenses; [ asl20 ]; - homepage = "http://metacpan.org/release/Specio-Library-Path-Tiny"; + homepage = https://metacpan.org/release/Specio-Library-Path-Tiny; }; }; @@ -13873,7 +13873,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { - homepage = http://plackperl.org; + homepage = https://plackperl.org; description = "Temporary buffer to save bytes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14859,7 +14859,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Test2-Plugin-NoWarnings"; + homepage = https://metacpan.org/release/Test2-Plugin-NoWarnings; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7033d31d044..80ca395a0265 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2040,7 +2040,7 @@ in { meta = { description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; - homepage = http://pythonhosted.org/tinycss/; + homepage = https://pythonhosted.org/tinycss/; }; }; @@ -2686,7 +2686,7 @@ in { }; meta = { - homepage = http://docs.python.org/3/library/functools.html; + homepage = https://docs.python.org/3/library/functools.html; }; }; @@ -8075,7 +8075,7 @@ in { disabled = isPy3k; src = pkgs.fetchurl { - url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; + url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; }; @@ -8084,7 +8084,7 @@ in { meta = { description = "Utilities for use with console mail clients, like mutt"; - homepage = http://www.blacktrash.org/hg/muttils; + homepage = https://www.blacktrash.org/hg/muttils; license = licenses.gpl2Plus; }; }); @@ -8232,7 +8232,7 @@ in { meta = { description = "Tool to measure, monitor and analyze memory behavior"; - homepage = http://pythonhosted.org/Pympler/; + homepage = https://pythonhosted.org/Pympler/; license = licenses.asl20; }; }; @@ -8716,7 +8716,7 @@ in { meta = { description = "A Python wrapper around notmuch"; - homepage = http://notmuchmail.org/; + homepage = https://notmuchmail.org/; maintainers = with maintainers; [ garbas ]; }; }; @@ -12322,7 +12322,7 @@ in { propagatedBuildInputs = with self; [ pyasn1 ]; meta = { - homepage = "http://stuvel.eu/rsa"; + homepage = https://stuvel.eu/rsa; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; @@ -13530,7 +13530,7 @@ in { doCheck = false; meta = { description = "Sphinx spelling extension"; - homepage = "http://bitbucket.org/dhellmann/sphinxcontrib-spelling"; + homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; maintainers = with maintainers; [ nand0p ]; license = licenses.bsd2; }; @@ -13802,7 +13802,7 @@ in { meta = { description = "Utility belt for automated testing"; - homepage = "http://falcao.it/sure/"; + homepage = https://falcao.it/sure/; license = licenses.gpl3Plus; }; }; @@ -13882,7 +13882,7 @@ in { propagatedBuildInputs = with self; [ six dateutil pytz ]; meta = { - homepage = http://github.com/ralphbean/taskw; + homepage = https://github.com/ralphbean/taskw; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; platforms = platforms.all; @@ -16148,7 +16148,7 @@ EOF ''; meta = { - homepage = http://pythonhosted.org/Logbook/; + homepage = https://pythonhosted.org/Logbook/; description = "A logging replacement for Python"; license = licenses.bsd3; }; @@ -17015,7 +17015,7 @@ EOF meta = { description = "Free console XMPP client"; - homepage = http://poez.io; + homepage = https://poez.io; license = licenses.mit; maintainers = [ maintainers.lsix ]; }; @@ -17088,7 +17088,7 @@ EOF meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; - homepage = "http://bitbucket.org/jurko/suds"; + homepage = https://bitbucket.org/jurko/suds; }; }; @@ -17527,7 +17527,7 @@ EOF doCheck = false; meta = { description = "A client side encrypted pastebin"; - homepage = "http://0bin.net/"; + homepage = https://0bin.net/; license = licenses.wtfpl; }; }; From 98c1ad879a34954944972ac7465343d325f7156b Mon Sep 17 00:00:00 2001 From: Greg Hale Date: Wed, 27 Jun 2018 16:22:52 -0400 Subject: [PATCH 243/312] pHash: init at 0.9.4 (#42546) Fix style and redundancy issues pointed out by @jb55 --- maintainers/maintainer-list.nix | 5 +++ pkgs/development/libraries/phash/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/phash/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d485bbee473..91df639ee850 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1722,6 +1722,11 @@ github = "IvanMalison"; name = "Ivan Malison"; }; + imalsogreg = { + email = "imalsogreg@gmail.com"; + github = "imalsogreg"; + name = "Greg Hale"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix new file mode 100644 index 000000000000..4cc607345e8c --- /dev/null +++ b/pkgs/development/libraries/phash/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pHash"; + version = "0.9.4"; + + buildInputs = [ cimg ]; + + # CImg.h calls to external binary `convert` from the `imagemagick` package + # at runtime + propagatedBuildInputs = [ imagemagick ]; + + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; + postInstall = '' + cp ${cimg}/include/CImg.h $out/include/ + ''; + + src = fetchFromGitHub { + owner = "clearscene"; + repo = "pHash"; + rev = version; + sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Compute the perceptual hash of an image"; + license = licenses.gpl3; + maintainers = [maintainers.imalsogreg]; + platforms = platforms.all; + homepage = http://www.phash.org; + downloadPage = "https://github.com/clearscene/pHash"; + updateWalker = true; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 507f3ee5d845..4202685e4911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4078,6 +4078,8 @@ with pkgs; pasystray = callPackage ../tools/audio/pasystray { }; + phash = callPackage ../development/libraries/phash { }; + pnmixer = callPackage ../tools/audio/pnmixer { }; pulsemixer = callPackage ../tools/audio/pulsemixer { }; From bceb29f177e17117edc8cb21510a12992d09061f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 16:45:52 -0400 Subject: [PATCH 244/312] unixtools: add killall --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/unix-tools.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d358fe37106c..95331ff8482c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21731,7 +21731,7 @@ with pkgs; unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf - getent locale; + getent locale killall; fts = if hostPlatform.isMusl then netbsd.fts else null; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index c1bd46ad68dc..a46d2897f4ed 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -81,6 +81,10 @@ let linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; }; + killall = { + linux = pkgs.psmisc; + darwin = pkgs.darwin.shell_cmds; + }; locale = { linux = pkgs.glibc; darwin = pkgs.netbsd.locale; From 161414063fa9a87b61e5460c61ab1125c9e68e55 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Jun 2018 16:47:21 -0400 Subject: [PATCH 245/312] treewide: use killall --- pkgs/applications/networking/syncthing-gtk/default.nix | 7 +++++-- pkgs/servers/http/myserver/default.nix | 4 ++-- pkgs/tools/misc/xfstests/default.nix | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index be574acc8c75..9d720bee05e7 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook +, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, bcrypt, gobjectIntrospection }: buildPythonApplication rec { version = "0.9.4"; @@ -35,7 +38,7 @@ buildPythonApplication rec { }) (substituteAll { src = ./paths.patch; - killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; + killall = "${killall}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index fa3b57a0b22e..a18ac202a4a2 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, psmisc }: +, libxml2, zlib, guile, texinfo, cppunit, killall }: let version = "0.11"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # On GNU/Linux the `test_suite' process sometimes stays around, so # forcefully terminate it. - postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; + postCheck = "${killall}/bin/killall test_suite || true"; meta = { description = "GNU MyServer, a powerful and easy to configure web server"; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index e6c67ddb9bb8..80a728747fef 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,6 @@ -{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils -, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su +{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs +, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool +, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { @@ -90,7 +91,9 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils + libcap lvm2 perl procps killall quota + utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; From ed533ba946e452d8db4b85d8a15bea9472f022a0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 27 Jun 2018 23:57:14 +0200 Subject: [PATCH 246/312] shadowfox: init at 1.5.2 (#42313) --- pkgs/tools/networking/shadowfox/default.nix | 29 ++++++++ pkgs/tools/networking/shadowfox/deps.nix | 75 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 106 insertions(+) create mode 100644 pkgs/tools/networking/shadowfox/default.nix create mode 100644 pkgs/tools/networking/shadowfox/deps.nix diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix new file mode 100644 index 000000000000..eb2fe70cf4ba --- /dev/null +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "shadowfox-${version}"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "SrKomodo"; + repo = "shadowfox-updater"; + rev = "v${version}"; + sha256 = "07695hba72q722d18q75pwa45azg9jibj6vqnhwb7mnwz2i7hkkc"; + }; + + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; + goDeps = ./deps.nix; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + description = '' + This project aims at creating a universal dark theme for Firefox while + adhering to the modern design principles set by Mozilla. + ''; + homepage = "https://overdodactyl.github.io/ShadowFox/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/networking/shadowfox/deps.nix b/pkgs/tools/networking/shadowfox/deps.nix new file mode 100644 index 000000000000..f3a824af686e --- /dev/null +++ b/pkgs/tools/networking/shadowfox/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "b3cebc399d6f98536af845ed8a5144ab586f6759"; + sha256 = "1kbf08msh4bjbdwnj1cjmddl5jfiarswfim3q085x77bcb43l0qa"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "cec2bdc49009247305a260b082a18e802d0fe292"; + sha256 = "0d4ab6v83w5ya4rnnaymasmza4p2jl0lqf4xcgsmsk6lnnrwm5s8"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "d9cec903b20cbeda6062366e460c2c1bdc717e4d"; + sha256 = "1j8nxi71v0qplfx6alfdx8rm2dxrcfk2k27gjrh2aksa322cmryb"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "306abd9cb98c97417ab6c58aa0400b2e5daac88b"; + sha256 = "00q8hymxa36a178hbzylsw3ald6a7gyg8adnki3flyv1jg3dnahx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; + sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4202685e4911..a1ccf40429a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17988,6 +17988,8 @@ with pkgs; setbfree = callPackage ../applications/audio/setbfree { }; + shadowfox = callPackage ../tools/networking/shadowfox { }; + shfmt = callPackage ../tools/text/shfmt { }; shutter = callPackage ../applications/graphics/shutter { }; From 3688ab8f5d524cd54fd3f4e3d820d82f77f2940d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 14:58:38 -0700 Subject: [PATCH 247/312] smplayer: 18.5.0 -> 18.6.0 (#42674) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/smplayer/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/9qa6s45c82jpkwqaf32i423my6by5ynk-smplayer-18.6.0/bin/smplayer had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/9qa6s45c82jpkwqaf32i423my6by5ynk-smplayer-18.6.0/bin/simple_web_server had a zero exit code or showed the expected version - 0 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 18.6.0 with grep in /nix/store/9qa6s45c82jpkwqaf32i423my6by5ynk-smplayer-18.6.0 - directory tree listing: https://gist.github.com/8b3f0826d462c03465088136a4d84512 - du listing: https://gist.github.com/f1d3e833d4b6317c73836b43e52e12fe --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 75dbb06235b9..107939086325 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.5.0"; + name = "smplayer-18.6.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0fxd8zmp5dyk7y9yymjhj2i5218nfvfqb4830pgzzjqz1zdax8rn"; + sha256 = "0pb862l175ycm6fm90nryzgbqy8kbwpv3i6cbn13h7jh1yrz8nqx"; }; buildInputs = [ qtscript ]; From 4ee926e1438ebaeb615a76201b125700648e10c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 17:44:59 -0700 Subject: [PATCH 248/312] marp: 0.0.12 -> 0.0.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/marp/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/xyisjivarv9zwlwh6nm0i55njfw7dkss-marp-0.0.13/bin/Marp had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.0.13 with grep in /nix/store/xyisjivarv9zwlwh6nm0i55njfw7dkss-marp-0.0.13 - directory tree listing: https://gist.github.com/d9ae780141c62a0f06dfa28225d45e9a - du listing: https://gist.github.com/2b208d562d59a7343631492d214dbfd1 --- pkgs/applications/office/marp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 7f6d93a11ae2..6ff0cf1dfd05 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32"; + sha256 = "1120mbw4mf7v4qfmss3121gkgp5pn31alk9cssxbrmdcsdkaq5ld"; }; sourceRoot = "."; From e9d91ab5f36a6c01146f8b74f16d20f6b4b83628 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 18:15:24 -0700 Subject: [PATCH 249/312] nftables: 0.8.5 -> 0.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nftables/versions. These checks were done: - built on NixOS - /nix/store/dsjhy8fws8j0awprkf894mrl2rz6a53q-nftables-0.9.0/bin/nft passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.9.0 with grep in /nix/store/dsjhy8fws8j0awprkf894mrl2rz6a53q-nftables-0.9.0 - directory tree listing: https://gist.github.com/2aa6bc0f10c5a26cd1ad6d17106daad5 - du listing: https://gist.github.com/e87dd21c1ba327481635ea9b36b9aa67 --- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 63d389fdb1f8..8bb42dff0945 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,12 +2,12 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.9.0"; name = "nftables-${version}"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "08z3xaxdryi0i9gcfifs77c96xs8ljynkr2hbfgf3w67l60az6wf"; + sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; configureFlags = [ From db44f2614beed706af5460a9e589635d037ac5e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 19:38:07 -0700 Subject: [PATCH 250/312] iperf2: 2.0.11 -> 2.0.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iperf/versions. These checks were done: - built on NixOS - /nix/store/c7p3b3b353pssma0cg1wg78pfs6x2is3-iperf-2.0.12/bin/iperf passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.0.12 with grep in /nix/store/c7p3b3b353pssma0cg1wg78pfs6x2is3-iperf-2.0.12 - directory tree listing: https://gist.github.com/457110ea6db3cd3dbd6c9bc7ff82477a - du listing: https://gist.github.com/86655ffd63846a5d3a473393af8e4da9 --- pkgs/tools/networking/iperf/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 33e9841eb058..6d26cf591bae 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.11"; + name = "iperf-2.0.12"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp"; + sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; }; hardeningDisable = [ "format" ]; From 62620340363674a053ef5db77d391575abf9d162 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 28 Jun 2018 04:22:20 +0900 Subject: [PATCH 251/312] feedgnuplot: init at 1.49 --- pkgs/tools/graphics/feedgnuplot/default.nix | 50 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/graphics/feedgnuplot/default.nix diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix new file mode 100644 index 000000000000..58b1e7a9dc93 --- /dev/null +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk +, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +}: + +let + + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + +in + +buildPerlPackage rec { + name = "feedgnuplot-${version}"; + version = "1.49"; + + src = fetchFromGitHub { + owner = "dkogan"; + repo = "feedgnuplot"; + rev = "v${version}"; + sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; + }; + + nativeBuildInputs = [ makeWrapper gawk ]; + + buildInputs = [ gnuplot perl ] + ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = fontsConf; + + postPatch = '' + patchShebangs . + ''; + + doCheck = true; + + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + ''; + + + meta = with stdenv.lib; { + description = "General purpose pipe-oriented plotting tool"; + homepage = https://github.com/dkogan/feedgnuplot/; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = with maintainers; [ mnacamura ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 507f3ee5d845..a8968df66875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2429,6 +2429,8 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; + feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; From c315d355bec46edb316c384f461867e9a784d2e2 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 28 Jun 2018 12:23:55 +0900 Subject: [PATCH 252/312] feedgnuplot: install shell completions --- pkgs/tools/graphics/feedgnuplot/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 58b1e7a9dc93..f998a288287d 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -37,9 +37,12 @@ buildPerlPackage rec { wrapProgram $out/bin/feedgnuplot \ --prefix "PATH" ":" "$PATH" \ --prefix "PERL5LIB" ":" "$PERL5LIB" + install -D -m 444 -t $out/share/bash-completion/completions \ + completions/bash/feedgnuplot + install -D -m 444 -t $out/share/zsh/site-functions \ + completions/zsh/_feedgnuplot ''; - meta = with stdenv.lib; { description = "General purpose pipe-oriented plotting tool"; homepage = https://github.com/dkogan/feedgnuplot/; From 56fe7646e01b02a25f10259d4dee6a32869a5a01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 20:48:52 -0700 Subject: [PATCH 253/312] i2pd: 2.18.0 -> 2.19.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/i2pd/versions. These checks were done: - built on NixOS - /nix/store/gdklqhnf7wzbvishm0kg30sn2cnyyql6-i2pd-2.19.0/bin/i2pd passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.19.0 with grep in /nix/store/gdklqhnf7wzbvishm0kg30sn2cnyyql6-i2pd-2.19.0 - directory tree listing: https://gist.github.com/b368821dcfd8906bc0c04fc1f74bf93a - du listing: https://gist.github.com/360ed57afe937d2071c05ec6896aad89 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index dad00cfd9ee1..c7d7b5ec6dfd 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h"; + sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From 2579942661f9a615808fc4e49fb5b8a2c2ad7725 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 21:43:57 -0700 Subject: [PATCH 254/312] feh: 2.26.3 -> 2.26.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/feh/versions. These checks were done: - built on NixOS - /nix/store/81pgn9ww37hp996d45xrm9wbl6z8wfc3-feh-2.26.4/bin/feh passed the binary check. - /nix/store/81pgn9ww37hp996d45xrm9wbl6z8wfc3-feh-2.26.4/bin/.feh-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.26.4 with grep in /nix/store/81pgn9ww37hp996d45xrm9wbl6z8wfc3-feh-2.26.4 - directory tree listing: https://gist.github.com/13a57ff84731135ece55fe0c99093a7d - du listing: https://gist.github.com/dda79019b9ca9069b6dd9dbb773bf602 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index eb7daf2797bf..dad378affbea 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.3"; + version = "2.26.4"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; + sha256 = "15a7hjg7xwj1hsw3c5k18psvvmbqgn4g79qq03bsvibzl4kqakq7"; }; outputs = [ "out" "man" "doc" ]; From b9f4afa38cedaac1b426765e80f6b817e5ff357b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 22:45:23 -0700 Subject: [PATCH 255/312] cpp-hocon: 0.1.6 -> 0.1.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cpp-hocon/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.1.7 with grep in /nix/store/xvra7ffhxjj2p4j80p253jwjxgwyp1rl-cpp-hocon-0.1.7 - directory tree listing: https://gist.github.com/f58abd979d8b4e35bed032e929b39177 - du listing: https://gist.github.com/361aabaa0ba139c553980b12090a1f95 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 236d634a514b..1f4b43db16c3 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { - sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc"; + sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; From 506032b24c0273517222adb5b54a9227a05f2619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 22:56:34 -0700 Subject: [PATCH 256/312] eid-mw: 4.4.2 -> 4.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eid-mw/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/sis599r39a2g7kvnv1d09l6sy6kn45l0-eid-mw-4.4.3/bin/eid-viewer had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/sis599r39a2g7kvnv1d09l6sy6kn45l0-eid-mw-4.4.3/bin/.eid-viewer-wrapped had a zero exit code or showed the expected version - /nix/store/sis599r39a2g7kvnv1d09l6sy6kn45l0-eid-mw-4.4.3/bin/beid-update-nssdb passed the binary check. - /nix/store/sis599r39a2g7kvnv1d09l6sy6kn45l0-eid-mw-4.4.3/bin/eid-nssdb passed the binary check. - 2 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 4.4.3 with grep in /nix/store/sis599r39a2g7kvnv1d09l6sy6kn45l0-eid-mw-4.4.3 - directory tree listing: https://gist.github.com/3bca8b9d321e62009daf1d388923ec47 - du listing: https://gist.github.com/64220a7b5b960cbd2ec3bb5f61c93a29 --- 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 53ce183d4afb..9f334b4a9602 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { - sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf"; + sha256 = "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 0c96b7099e4f49a4dd2d57c297ff142c5df9da26 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 28 Jun 2018 13:58:28 +0800 Subject: [PATCH 257/312] hedgewars: 0.9.23 -> 0.9.24.1 --- pkgs/games/hedgewars/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 2196fede32fc..52f476fa447d 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut +{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGLU_combined, physfs }: @@ -10,17 +10,18 @@ let ]); in stdenv.mkDerivation rec { - version = "0.9.23"; + version = "0.9.24.1"; name = "hedgewars-${version}"; src = fetchurl { url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; - sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns"; + sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc - qt4 ghc ffmpeg freeglut makeWrapper physfs + ghc ffmpeg freeglut makeWrapper physfs + qt5.qttools qt5.qtbase ]; postPatch = '' From 5e885b005d12eeca0be89cebe50967d3e5ac91dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 23:04:35 -0700 Subject: [PATCH 258/312] deadbeef-mpris2-plugin: 1.10 -> 1.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/deadbeef-mpris2-plugin/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.11 with grep in /nix/store/isa0i2bjry1xg3l8895k10w1zwd4ij9f-deadbeef-mpris2-plugin-1.11 - directory tree listing: https://gist.github.com/020d669dc365b545d61d171c5566d03a - du listing: https://gist.github.com/9cd938a3d8215dbc4f00d62fe20ca4f5 --- 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 c6509b5f460e..4e2e75953f35 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "deadbeef-mpris2-plugin-${version}"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75"; + sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0"; }; nativeBuildInputs = [ pkgconfig ]; From 7c96b917a5b174eebd58bd1e297e747875a8bda1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 28 Jun 2018 14:12:43 +0800 Subject: [PATCH 259/312] pythonPackages.btrees: Fix tests by adding zope_testrunner input --- pkgs/development/python-modules/btrees/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index b7b9820b7a98..372f16bec743 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }: +{ stdenv +, fetchPypi +, buildPythonPackage +, persistent +, zope_interface +, transaction +, zope_testrunner +}: buildPythonPackage rec { pname = "BTrees"; @@ -7,6 +14,7 @@ buildPythonPackage rec { buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; + checkInputs = [ zope_testrunner ]; src = fetchPypi { inherit pname version; From 7261a66d713aabf30249535bfa53e5d205c4423e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 28 Jun 2018 08:23:49 +0200 Subject: [PATCH 260/312] python37: 3.7.0rc1 -> 3.7.0 --- pkgs/development/interpreters/python/cpython/3.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index aae1041a224a..9cc0377f925f 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let majorVersion = "3.7"; minorVersion = "0"; - minorVersionSuffix = "rc1"; + minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 2fbe2fdc68aedadfe5324d2e1d559b875a92fbe8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 Jun 2018 23:54:53 -0700 Subject: [PATCH 261/312] abcmidi: 2018.06.13 -> 2018.06.23 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/abcMIDI/versions. These checks were done: - built on NixOS - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/abc2midi passed the binary check. - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/midi2abc passed the binary check. - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/abc2abc passed the binary check. - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/mftext passed the binary check. - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/yaps passed the binary check. - Warning: no invocation of /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/midicopy had a zero exit code or showed the expected version - /nix/store/4qkyx6if8zsdv2msnpl5i020vc1k2fg1-abcMIDI-2018.06.23/bin/abcmatch passed the binary check. - 6 of 7 passed binary check by having a zero exit code. - 0 of 7 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/a4a2746a6da64d05744606861cb9987a - du listing: https://gist.github.com/a08bedfb270cfa58dc555486ba421a75 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 46b4ada3d573..edb67c13b9cd 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.13"; + version = "2018.06.23"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy"; + sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 1747ec308aaf1c196a5e8941780b8e64c30059c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jun 2018 06:18:09 +0000 Subject: [PATCH 262/312] ocamlPackages.lambdaTerm: remove spurious dependency to camlp4 --- pkgs/development/ocaml-modules/lambda-term/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index fdd30d28ed89..c1e268f686b0 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }: +{ stdenv, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; -buildOcaml rec { +stdenv.mkDerivation rec { version = "1.12.0"; - name = "lambda-term"; + name = "ocaml${ocaml.version}-lambda-term-${version}"; src = fetchurl { url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz"; From 9a7d6c2e3dc42993f46593846515e0debfb2da47 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jun 2018 06:18:35 +0000 Subject: [PATCH 263/312] ocamlPackages.utop: 1.19.3 -> 2.1.0 --- pkgs/development/tools/ocaml/utop/default.nix | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 404bf08e74ee..340c57f28176 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 -, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +, lambdaTerm, cppo, makeWrapper }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" @@ -7,30 +7,20 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "1.19.3"; + version = "2.1.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x"; + sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ]; - propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; + propagatedBuildInputs = [ lambdaTerm ]; - createFindlibDestdir = true; - - configureFlags = [ "--enable-camlp4" ] - ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact"; - - buildPhase = '' - make - make doc - ''; - - dontStrip = true; + inherit (jbuilder) installPhase; postFixup = let From 092f4193cdeafad901f9dde60e0b81a9645a8966 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 28 Jun 2018 01:14:36 -0700 Subject: [PATCH 264/312] arangodb: 3.3.10 -> 3.3.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions. These checks were done: - built on NixOS - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/foxx-manager passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangoinspect passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangobench passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangodump passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangoexport passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangoimp passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangorestore passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangosh passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangovpack passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arango-dfdb passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arango-init-database passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arango-secure-installation passed the binary check. - /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11/bin/arangod passed the binary check. - 13 of 13 passed binary check by having a zero exit code. - 0 of 13 passed binary check by having the new version present in output. - found 3.3.11 with grep in /nix/store/naj61i7k3knl6h4anl6ilar8rsb5q44c-arangodb-3.3.11 - directory tree listing: https://gist.github.com/c85df63a5de699920581d43d50632b57 - du listing: https://gist.github.com/14a76494487774fdcab46a1042b042c8 --- pkgs/servers/nosql/arangodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index c330837cdbbe..347af1c4de9f 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.10"; + version = "3.3.11"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0c0n681k2z73klb5inhfdy2qzkba681kzg01gwpc6qdnvya8mk9f"; + sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21"; }; buildInputs = [ From a793b31caa60493614b7e3f9860c1f936c8c0592 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 28 Jun 2018 01:25:06 -0700 Subject: [PATCH 265/312] calamares: 3.2.0 -> 3.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/calamares/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/krqvinap3lgbn4ka1qnshi9mxvlj9syl-calamares-3.2.1/bin/calamares had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.2.1 with grep in /nix/store/krqvinap3lgbn4ka1qnshi9mxvlj9syl-calamares-3.2.1 - directory tree listing: https://gist.github.com/9765935d9d60806e75255e4a33bbba21 - du listing: https://gist.github.com/c356abacb504a32f4376ca8fd2e58638 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 5dba7744d7b3..e154e217e951 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.0"; + version = "3.2.1"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64"; + sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9"; }; buildInputs = [ From ba15c00e9869f2734ad9c8456f4ed778e69acf54 Mon Sep 17 00:00:00 2001 From: timor Date: Thu, 28 Jun 2018 11:04:53 +0200 Subject: [PATCH 266/312] ceres-solver: clean up cmake configuration (#42661) No need to explicitely set cmakeFlags, specifying the eigen library in the build inputs is enough. --- pkgs/development/libraries/ceres-solver/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 1e2017ef0e7f..432e49c4354f 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -20,19 +20,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ glog ] + buildInputs = [ eigen glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; - inherit eigen; - doCheck = runTests; checkTarget = "test"; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; - meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; From e82e01bb612a8afef56ef7870ec2710e0936f462 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Thu, 28 Jun 2018 09:35:58 +0200 Subject: [PATCH 267/312] pythonPackages.cheroot: fixed tests --- .../development/python-modules/cheroot/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 398f52cefd2a..7a7d44339ba4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchPypi, buildPythonPackage , more-itertools, six , pytest, pytestcov, portend -, backports_unittest-mock, setuptools_scm }: +, backports_unittest-mock +, backports_functools_lru_cache }: buildPythonPackage rec { pname = "cheroot"; @@ -14,9 +15,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools six ]; - buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest pytestcov portend backports_unittest-mock backports_functools_lru_cache ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; +# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs, +# and is only used to skip some tests that are already known to work. + postPatch = '' + substituteInPlace "./pytest.ini" --replace "--testmon" "" + substituteInPlace setup.py --replace "use_scm_version=True" "version=\"${version}\"" \ + --replace "'setuptools_scm>=1.15.0'," "" \ + --replace "'setuptools_scm_git_archive>=1.0'," "" \ + ''; checkPhase = '' py.test cheroot From f11281bdcf86b5ba5b53b9ebcd033f1dbf8a8942 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Thu, 28 Jun 2018 11:14:33 +0200 Subject: [PATCH 268/312] pythonPackages.cherrypy: fixed tests --- pkgs/development/python-modules/cherrypy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 368111b3651f..47aca123998f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , cheroot, portend, routes, six , setuptools_scm , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov +, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ]; + checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' LANG=en_US.UTF-8 pytest From c5da007af5a33cbed927d3aff5553c82b6de0a08 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 28 Jun 2018 12:04:30 +0200 Subject: [PATCH 269/312] nixos/zfs: load encryption keys for all pools (#41846) fixes #41838 At the moment it works fine for "file://" keys, but does not work for dataPools with "prompt" keys, because the passphrase cannot be entered (yet). --- nixos/modules/tasks/filesystems/zfs.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b8a420b7d745..bfcd81d62159 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -171,8 +171,12 @@ in default = config.boot.zfs.enableUnstable; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. + For root pools the encryption key can be supplied via both an + interactive prompt (keylocation=prompt) and from a file + (keylocation=file://). Note that for data pools the encryption key can + be only loaded from a file and not via interactive prompt since the + import is processed in a background systemd service. ''; }; @@ -394,6 +398,7 @@ in script = '' zpool_cmd="${packages.zfsUser}/sbin/zpool" ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} ''; }; From cb303b8074d10a1e4d4b18673a94e27379183384 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Thu, 28 Jun 2018 06:47:36 -0400 Subject: [PATCH 270/312] firebird-emu: init at 1.4 (#42663) * firebird-emu: init at 1.4 * firebird-emu: limit platform to linux Other platforms fail to compile currently. --- pkgs/misc/emulators/firebird-emu/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/misc/emulators/firebird-emu/default.nix diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix new file mode 100644 index 000000000000..882bf13f4eaf --- /dev/null +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: + +stdenv.mkDerivation rec { + name = "firebird-emu-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "nspire-emus"; + repo = "firebird"; + rev = "v${version}"; + sha256 = "0pdca6bgnmzfgf5kp83as99y348gn4plzbxnqxjs61vp489baahq"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtdeclarative ]; + + makeFlags = [ "INSTALL_ROOT=$(out)" ]; + + # Attempts to install to /usr/bin and /usr/share/applications, which Nix does + # not use. + prePatch = '' + substituteInPlace firebird.pro \ + --replace '/usr/' '/' + ''; + + meta = { + homepage = https://github.com/nspire-emus/firebird; + description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; + # Only tested on Linux, but likely possible to build on, e.g. macOS + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1ccf40429a6..e76a38cdb82e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2399,6 +2399,8 @@ with pkgs; fio = callPackage ../tools/system/fio { }; + firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + flamerobin = callPackage ../applications/misc/flamerobin { }; flashtool = callPackage_i686 ../development/mobile/flashtool { From 1c40ea1f2681575e82b7140cf40c633fec319181 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 28 Jun 2018 13:10:37 +0200 Subject: [PATCH 271/312] dwm-status: 1.0.0 -> 1.1.1 (#42682) --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d76412df0624..9f1e565d1666 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "0r0irzm5y9xvqxrr8gvvn4x9c56qwgynljnzba4mh5s5dpbmz0iq"; + sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "DWM status service which dynamically updates when needed"; + description = "Highly performant and configurable DWM status service"; homepage = https://github.com/Gerschtli/dwm-status; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; From e68861a2ca63bdc5e3541b1c8e89b8d177c78f72 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Thu, 28 Jun 2018 13:15:48 +0200 Subject: [PATCH 272/312] cargo-tree: 0.18.0 -> 0.19.0 (#42720) --- pkgs/tools/package-management/cargo-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index a9c1a1a33b3c..5ac13fc42cfd 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + sha256 = "16vsw392qs3ag2brvcan19km7ds0s9s7505p3hnfjvjrzgdliir3"; }; - cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + cargoSha256 = "0g6afhqqdf76axbcs5wj9gydsabd3d5ja8qd8z8y6wbp7n0y4h6a"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; From b6411d5e58d3f449179dca415b8a01012a73f724 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 28 Jun 2018 20:46:10 +0900 Subject: [PATCH 273/312] feedgnuplot: disable tests --- pkgs/tools/graphics/feedgnuplot/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index f998a288287d..4e371ffd2b07 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -31,7 +31,8 @@ buildPerlPackage rec { patchShebangs . ''; - doCheck = true; + # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. + doCheck = false; postInstall = '' wrapProgram $out/bin/feedgnuplot \ From f5d834e6bbc29c3c7a1bf2d4972e882c2bcc8f16 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Jun 2018 07:57:19 -0500 Subject: [PATCH 274/312] lit: 0.5.1 -> 0.6.0 --- pkgs/development/tools/misc/lit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 42824d1a543e..60f256c2ddaf 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.5.1"; + version = "0.6.0"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97"; + sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb"; }; # Non-standard test suite. Needs custom checkPhase. From 40f4b67302d21a45f9d9065efa831d230f15b274 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 10:19:09 -0400 Subject: [PATCH 275/312] libcCrossChooser: fix xcode eval it should be targetPackages.darwin.iosSdkPkgs.libraries --- 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 e76a38cdb82e..38ad07f2e697 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9284,7 +9284,7 @@ with pkgs; else if name == "uclibc" then targetPackages.uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries + else if targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; From e686bd277196f33fccb685c4526333ebc50d1768 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 10:22:21 -0400 Subject: [PATCH 276/312] xcode: default to 8.2 There is some weird issue with 9.4 that needs to be resolved. 8.2 is used by iOS anyway so that makes it easier. --- pkgs/os-specific/darwin/xcode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 252fe5abf49f..910f1b91c215 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -46,5 +46,5 @@ in lib.makeExtensible (self: { xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "8.2")}"; }) From d361371d236c90bfb550e827124b5350deeadbda Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 11:11:19 -0400 Subject: [PATCH 277/312] generators: refactor toPLIST --- lib/generators.nix | 84 ++++++++++---------- pkgs/development/tools/xcbuild/platform.nix | 10 +-- pkgs/development/tools/xcbuild/sdk.nix | 4 +- pkgs/development/tools/xcbuild/toolchain.nix | 2 +- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index aab4498f9c64..143329815837 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -176,51 +176,51 @@ rec { else abort "toPretty: should never happen (v = ${v})"; # PLIST handling + toPLIST = {}: v: let + pprExpr = ind: x: with builtins; + if isNull x then "" else + if isBool x then pprBool ind x else + if isInt x then pprInt ind x else + if isString x then pprStr ind x else + if isList x then pprList ind x else + if isAttrs x then pprAttrs ind x else + abort "pprExpr: should never happen (v = ${v})"; - toPLIST = x: '' + pprLiteral = ind: x: ind + x; + + pprBool = ind: x: pprLiteral ind (if x then "" else ""); + pprInt = ind: x: pprLiteral ind "${toString x}"; + pprStr = ind: x: pprLiteral ind "${x}"; + pprKey = ind: x: pprLiteral ind "${x}"; + + pprIndent = ind: pprExpr "\t${ind}"; + + pprItem = ind: libStr.concatMapStringsSep "\n" (pprIndent ind); + + pprList = ind: x: libStr.concatStringsSep "\n" [ + (pprLiteral ind "") + (pprItem ind x) + (pprLiteral ind "") + ]; + + pprAttrs = ind: x: libStr.concatStringsSep "\n" [ + (pprLiteral ind "") + (pprAttr ind x) + (pprLiteral ind "") + ]; + + pprAttr = let attrFilter = name: value: name != "_module" && value != null; + in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList + (name: value: lib.optional (attrFilter name value) [ + (pprKey "\t${ind}" name) + (pprExpr "\t${ind}" value) + ]) x)); + + in '' - '' + pprExpr "" x - + "\n"; - - pprExpr = ind: x: with builtins; - if isNull x then "" else - if isBool x then pprBool ind x else - if isInt x then pprInt ind x else - if isString x then pprStr ind x else - if isList x then pprList ind x else - if isAttrs x then pprAttrs ind x else - throw "invalid plist type"; - - pprLiteral = ind: x: ind + x; - - pprBool = ind: x: pprLiteral ind (if x then "" else ""); - pprInt = ind: x: pprLiteral ind "${toString x}"; - pprStr = ind: x: pprLiteral ind "${x}"; - pprKey = ind: x: pprLiteral ind "${x}"; - - pprIndent = ind: pprExpr "\t${ind}"; - - pprItem = ind: libStr.concatMapStringsSep "\n" (pprIndent ind); - - pprList = ind: x: libStr.concatStringsSep "\n" [ - (pprLiteral ind "") - (pprItem ind x) - (pprLiteral ind "") - ]; - - pprAttrs = ind: x: libStr.concatStringsSep "\n" [ - (pprLiteral ind "") - (pprAttr ind x) - (pprLiteral ind "") - ]; - - attrFilter = name: value: name != "_module" && value != null; - - pprAttr = ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList (name: value: lib.optional (attrFilter name value) [ - (pprKey "\t${ind}" name) - (pprExpr "\t${ind}" value) - ]) x)); + ${pprExpr "" v} + ''; } diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index e3fb83edc674..502c3bcdbc87 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -286,11 +286,11 @@ let in runCommand "MacOSX.platform" {} '' - install -D ${writeText "Info.plist" (toPLIST Info)} $out/Info.plist - install -D ${writeText "version.plist" (toPLIST Version)} $out/version.plist - install -D ${writeText "Architectures.xcspec" (toPLIST Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec - install -D ${writeText "PackageTypes.xcspec" (toPLIST PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec - install -D ${writeText "ProductTypes.xcspec" (toPLIST ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec + install -D ${writeText "Info.plist" (toPLIST {} Info)} $out/Info.plist + install -D ${writeText "version.plist" (toPLIST {} Version)} $out/version.plist + install -D ${writeText "Architectures.xcspec" (toPLIST {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec + install -D ${writeText "PackageTypes.xcspec" (toPLIST {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec + install -D ${writeText "ProductTypes.xcspec" (toPLIST {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec 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 2d43347da03d..5fdfe5877228 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -24,6 +24,6 @@ in runCommand "MacOSX${version}.sdk" { inherit version; } '' - install -D ${writeText "SDKSettings.plist" (toPLIST SDKSettings)} $out/SDKSettings.plist - install -D ${writeText "SystemVersion.plist" (toPLIST SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist + install -D ${writeText "SDKSettings.plist" (toPLIST {} SDKSettings)} $out/SDKSettings.plist + install -D ${writeText "SystemVersion.plist" (toPLIST {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist '' diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index d8c80b53831c..ed5730abddf6 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -24,7 +24,7 @@ runCommand "nixpkgs.xctoolchain" { nativeBuildInputs = [ makeWrapper ]; } ('' mkdir -p $out - install -D ${writeText "ToolchainInfo.plist" (toPLIST ToolchainInfo)} $out/ToolchainInfo.plist + install -D ${writeText "ToolchainInfo.plist" (toPLIST {} ToolchainInfo)} $out/ToolchainInfo.plist mkdir -p $out/usr/include mkdir -p $out/usr/lib From 9720833743f1040b7bc45f079e1a754d81dc8eb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 28 Jun 2018 09:05:13 -0700 Subject: [PATCH 278/312] gdcm: 2.8.6 -> 2.8.7 (#42708) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdcm/versions. These checks were done: - built on NixOS - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcm2vtk passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmviewer passed the binary check. - Warning: no invocation of /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcm2pnm had a zero exit code or showed the expected version - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmdump passed the binary check. - Warning: no invocation of /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmdiff had a zero exit code or showed the expected version - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmraw passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmscanner passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmanon passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmgendir passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmimg passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmconv passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmtar passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcminfo passed the binary check. - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmscu passed the binary check. - Warning: no invocation of /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmxml had a zero exit code or showed the expected version - /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7/bin/gdcmpap3 passed the binary check. - 13 of 16 passed binary check by having a zero exit code. - 0 of 16 passed binary check by having the new version present in output. - found 2.8.7 with grep in /nix/store/b5k2wcykj6s3j1rax851vpzyj6amqpvk-gdcm-2.8.7 - directory tree listing: https://gist.github.com/d4d202ac57e29b5fe6d46f1e8b7b112b - du listing: https://gist.github.com/7244757ac1449adb1adde3c480e77c8d --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index dcdb6a2297b2..a4eab462046c 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.6"; + version = "2.8.7"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; + sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; }; dontUseCmakeBuildDir = true; From 3e6eb94038b4579c96e8bcf456cebc233fadeef7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 27 Jun 2018 10:57:55 -0500 Subject: [PATCH 279/312] tor-browser-bundle-bin: 7.5.5 -> 7.5.6 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index b8ee0aebb5fe..de6766709131 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.5"; + version = "7.5.6"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0v8mxxfqfpwm2nqmb3jyi91rqvxm4n391ilnvxavi00pd5p0glfh"; + sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1j1bhj50d0fqimcl10qfg076gp1wq42s6k9865jdvd3xfsgldnsj"; + sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461"; }; }; in From 57bccb3cb8f6b5dea5c315fcaabdb992498b9314 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 28 Jun 2018 20:43:35 +0200 Subject: [PATCH 280/312] treewide: http -> https sources (#42676) * treewide: http -> https sources This updates the source urls of all top-level packages from http to https where possible. * buildtorrent: fix url and tab -> spaces --- pkgs/applications/audio/MMA/default.nix | 2 +- pkgs/applications/audio/abcde/default.nix | 2 +- pkgs/applications/audio/aeolus/default.nix | 2 +- pkgs/applications/audio/audacious/default.nix | 2 +- pkgs/applications/audio/banshee/default.nix | 2 +- pkgs/applications/audio/beast/default.nix | 2 +- pkgs/applications/audio/bitmeter/default.nix | 2 +- pkgs/applications/audio/calf/default.nix | 2 +- pkgs/applications/audio/denemo/default.nix | 2 +- pkgs/applications/audio/drumgizmo/default.nix | 2 +- pkgs/applications/audio/ecasound/default.nix | 2 +- pkgs/applications/audio/fomp/default.nix | 2 +- pkgs/applications/audio/gigedit/default.nix | 2 +- pkgs/applications/audio/jaaa/default.nix | 2 +- .../audio/jack-capture/default.nix | 2 +- pkgs/applications/audio/jalv/default.nix | 2 +- pkgs/applications/audio/japa/default.nix | 2 +- .../applications/audio/ladspa-sdk/default.nix | 2 +- .../applications/audio/ladspa-sdk/ladspah.nix | 2 +- .../audio/linuxsampler/default.nix | 2 +- pkgs/applications/audio/mda-lv2/default.nix | 2 +- pkgs/applications/audio/mixxx/default.nix | 2 +- .../audio/monkeys-audio/default.nix | 2 +- .../audio/nova-filters/default.nix | 2 +- pkgs/applications/audio/paprefs/default.nix | 2 +- .../audio/pavucontrol/default.nix | 2 +- .../audio/pd-plugins/helmholtz/default.nix | 2 +- .../audio/pd-plugins/puremapping/default.nix | 2 +- .../audio/pd-plugins/zexy/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- .../audio/sonic-visualiser/default.nix | 2 +- pkgs/applications/audio/tetraproc/default.nix | 2 +- .../audio/x42-plugins/default.nix | 2 +- pkgs/applications/editors/geany/default.nix | 2 +- pkgs/applications/editors/jupp/default.nix | 2 +- .../editors/monodevelop/default.nix | 2 +- .../applications/editors/netbeans/default.nix | 2 +- pkgs/applications/editors/scite/default.nix | 2 +- pkgs/applications/editors/tweak/default.nix | 2 +- pkgs/applications/gis/grass/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 2 +- .../applications/graphics/glabels/default.nix | 2 +- pkgs/applications/graphics/gocr/default.nix | 2 +- pkgs/applications/graphics/imagej/default.nix | 2 +- .../graphics/imlibsetroot/default.nix | 2 +- .../graphics/jpegoptim/default.nix | 2 +- pkgs/applications/graphics/qiv/default.nix | 2 +- .../sane/backends/brscan4/default.nix | 2 +- pkgs/applications/graphics/seg3d/default.nix | 2 +- pkgs/applications/graphics/zgv/default.nix | 2 +- .../misc/audio/wavesurfer/default.nix | 2 +- pkgs/applications/misc/blender/default.nix | 2 +- pkgs/applications/misc/calcurse/default.nix | 2 +- pkgs/applications/misc/cherrytree/default.nix | 2 +- pkgs/applications/misc/confclerk/default.nix | 2 +- pkgs/applications/misc/cura/lulzbot.nix | 2 +- pkgs/applications/misc/fbreader/default.nix | 2 +- pkgs/applications/misc/girara/default.nix | 2 +- pkgs/applications/misc/gpsprune/default.nix | 2 +- pkgs/applications/misc/gxneur/default.nix | 2 +- .../misc/masterpdfeditor/default.nix | 2 +- pkgs/applications/misc/pdfdiff/default.nix | 2 +- pkgs/applications/misc/pgadmin/default.nix | 2 +- pkgs/applications/misc/pstree/default.nix | 2 +- pkgs/applications/misc/ptask/default.nix | 2 +- pkgs/applications/misc/sbagen/default.nix | 2 +- pkgs/applications/misc/tasksh/default.nix | 2 +- pkgs/applications/misc/tqsl/default.nix | 2 +- pkgs/applications/misc/vcal/default.nix | 2 +- pkgs/applications/misc/verbiste/default.nix | 2 +- pkgs/applications/misc/xneur/0.8.nix | 2 +- .../misc/xtermcontrol/default.nix | 2 +- .../misc/yubioath-desktop/default.nix | 2 +- .../networking/browsers/dillo/default.nix | 2 +- .../networking/cluster/flink/default.nix | 2 +- .../networking/cluster/kanif/default.nix | 2 +- .../networking/ids/bro/default.nix | 2 +- .../instant-messengers/mcabber/default.nix | 2 +- .../skype-call-recorder/default.nix | 2 +- .../telepathy/gabble/default.nix | 2 +- .../telepathy/haze/default.nix | 2 +- .../telepathy/logger/default.nix | 2 +- .../telepathy/mission-control/default.nix | 2 +- .../telepathy/salut/default.nix | 2 +- .../instant-messengers/viber/default.nix | 2 +- .../networking/irc/chatzilla/default.nix | 2 +- .../networking/jmeter/default.nix | 2 +- .../mailreaders/notmuch/default.nix | 2 +- .../mailreaders/sylpheed/default.nix | 2 +- .../mailreaders/thunderbird-bin/default.nix | 2 +- .../p2p/frostwire/frostwire-bin.nix | 2 +- .../networking/p2p/ncdc/default.nix | 2 +- .../networking/remote/x2goclient/default.nix | 2 +- .../networking/sniffers/kismet/default.nix | 2 +- .../networking/sniffers/wireshark/default.nix | 2 +- .../networking/vnstat/default.nix | 2 +- pkgs/applications/networking/znc/default.nix | 2 +- pkgs/applications/office/cb2bib/default.nix | 2 +- .../science/biology/igv/default.nix | 2 +- .../science/biology/iv/default.nix | 2 +- .../science/biology/neuron/default.nix | 2 +- .../science/electronics/verilator/default.nix | 2 +- pkgs/applications/science/logic/coq/8.3.nix | 2 +- pkgs/applications/science/logic/coq/8.4.nix | 2 +- .../science/logic/cvc4/default.nix | 2 +- .../science/logic/eprover/default.nix | 2 +- .../science/logic/isabelle/default.nix | 2 +- .../science/logic/leo2/default.nix | 2 +- .../science/logic/mcrl2/default.nix | 2 +- .../science/logic/prooftree/default.nix | 2 +- .../science/logic/prover9/default.nix | 2 +- .../science/logic/satallax/default.nix | 2 +- pkgs/applications/science/math/R/default.nix | 2 +- .../applications/science/math/cbc/default.nix | 2 +- .../science/math/csdp/default.nix | 2 +- .../science/math/glsurf/default.nix | 2 +- .../science/math/pari/default.nix | 2 +- pkgs/applications/science/math/pari/gp2c.nix | 2 +- .../science/math/sage/default.nix | 24 +++++++++---------- .../science/math/scilab-bin/default.nix | 2 +- .../science/math/scilab/default.nix | 2 +- .../science/math/scotch/default.nix | 2 +- .../science/physics/sacrifice/default.nix | 2 +- .../science/physics/sherpa/default.nix | 2 +- .../science/robotics/gazebo/default.nix | 2 +- pkgs/applications/search/recoll/default.nix | 2 +- .../git-and-tools/cgit/default.nix | 2 +- .../version-management/redmine/default.nix | 2 +- .../version-management/tailor/default.nix | 2 +- pkgs/applications/video/dvb-apps/default.nix | 2 +- pkgs/applications/video/xawtv/default.nix | 2 +- .../virtualization/spice-vdagent/default.nix | 2 +- .../virtualization/virtualbox/default.nix | 2 +- .../window-managers/herbstluftwm/default.nix | 2 +- .../window-managers/matchbox/default.nix | 2 +- .../window-managers/sawfish/default.nix | 2 +- .../window-managers/weston/default.nix | 2 +- pkgs/data/fonts/clearlyU/default.nix | 2 +- pkgs/data/fonts/proggyfonts/default.nix | 2 +- .../data/icons/hicolor-icon-theme/default.nix | 2 +- pkgs/data/misc/freepats/default.nix | 2 +- pkgs/data/misc/poppler-data/default.nix | 2 +- pkgs/development/compilers/asn1c/default.nix | 2 +- .../development/compilers/chicken/default.nix | 2 +- pkgs/development/compilers/clean/default.nix | 2 +- pkgs/development/compilers/colm/default.nix | 2 +- pkgs/development/compilers/gforth/default.nix | 2 +- .../development/compilers/mercury/default.nix | 2 +- .../compilers/mono/generic-cmake.nix | 2 +- pkgs/development/compilers/mono/generic.nix | 2 +- pkgs/development/compilers/nasm/default.nix | 2 +- .../compilers/nvidia-cg-toolkit/default.nix | 2 +- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- .../compilers/ocaml/ber-metaocaml-104.nix | 2 +- pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/compilers/scala/2.10.nix | 2 +- pkgs/development/compilers/scala/2.11.nix | 2 +- pkgs/development/compilers/scala/default.nix | 2 +- pkgs/development/compilers/yap/default.nix | 2 +- pkgs/development/compilers/yasm/default.nix | 2 +- .../interpreters/lua-4/default.nix | 2 +- pkgs/development/interpreters/lua-5/5.0.3.nix | 2 +- pkgs/development/interpreters/lua-5/5.1.nix | 2 +- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.5.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.6.nix | 2 +- .../interpreters/rascal/default.nix | 2 +- pkgs/development/libraries/CoinMP/default.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/SDL2/default.nix | 2 +- .../libraries/SDL2_image/default.nix | 2 +- .../libraries/SDL2_mixer/default.nix | 2 +- .../libraries/SDL2_net/default.nix | 2 +- .../development/libraries/SDL_gfx/default.nix | 2 +- .../libraries/SDL_image/default.nix | 2 +- .../libraries/SDL_sound/default.nix | 2 +- .../development/libraries/SDL_ttf/default.nix | 2 +- pkgs/development/libraries/adns/default.nix | 2 +- pkgs/development/libraries/aubio/default.nix | 2 +- .../libraries/audio/lilv/default.nix | 2 +- .../libraries/audio/sratom/default.nix | 2 +- .../libraries/audio/suil/default.nix | 2 +- .../libraries/audiofile/default.nix | 2 +- pkgs/development/libraries/babl/default.nix | 2 +- pkgs/development/libraries/c-ares/default.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- .../development/libraries/cairomm/default.nix | 2 +- .../development/libraries/cppunit/default.nix | 2 +- pkgs/development/libraries/ctpl/default.nix | 2 +- pkgs/development/libraries/db/generic.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 2 +- pkgs/development/libraries/eigen/2.0.nix | 2 +- pkgs/development/libraries/eigen/3.3.nix | 2 +- pkgs/development/libraries/eigen/default.nix | 2 +- pkgs/development/libraries/exempi/default.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- pkgs/development/libraries/gegl/3.0.nix | 2 +- pkgs/development/libraries/gegl/4.0.nix | 2 +- pkgs/development/libraries/geoclue/2.0.nix | 2 +- pkgs/development/libraries/geos/default.nix | 2 +- pkgs/development/libraries/gf2x/default.nix | 2 +- pkgs/development/libraries/gle/default.nix | 2 +- pkgs/development/libraries/gloox/default.nix | 2 +- .../libraries/gtdialog/default.nix | 2 +- .../libraries/harfbuzz/default.nix | 2 +- .../libraries/ip2location-c/default.nix | 2 +- pkgs/development/libraries/isl/0.11.1.nix | 2 +- .../libraries/java/dbus-java/default.nix | 2 +- .../libraries/java/geoipjava/default.nix | 2 +- .../java/libmatthew-java/default.nix | 2 +- .../development/libraries/jbigkit/default.nix | 2 +- pkgs/development/libraries/libLAS/default.nix | 2 +- pkgs/development/libraries/libabw/default.nix | 2 +- .../libraries/libantlr3c/default.nix | 2 +- .../libraries/libaudclient/default.nix | 2 +- pkgs/development/libraries/libbsd/default.nix | 2 +- pkgs/development/libraries/libcdr/default.nix | 2 +- .../libraries/libclthreads/default.nix | 2 +- .../libraries/libclxclient/default.nix | 2 +- .../development/libraries/libcutl/default.nix | 2 +- pkgs/development/libraries/libdap/default.nix | 2 +- .../libraries/libdivecomputer/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- .../libraries/libdwarf/default.nix | 2 +- .../libraries/libeatmydata/default.nix | 2 +- .../development/libraries/libebml/default.nix | 2 +- .../development/libraries/libedit/default.nix | 2 +- .../libraries/libexttextcat/default.nix | 2 +- .../libraries/libfakekey/default.nix | 2 +- pkgs/development/libraries/libftdi/1.x.nix | 2 +- .../development/libraries/libftdi/default.nix | 2 +- .../libraries/libgdiplus/default.nix | 2 +- .../libraries/libgeotiff/default.nix | 2 +- pkgs/development/libraries/libgig/default.nix | 2 +- .../libraries/libinput/default.nix | 2 +- .../libraries/libmatchbox/default.nix | 2 +- .../libraries/libmatheval/default.nix | 2 +- .../libraries/libmatroska/default.nix | 2 +- pkgs/development/libraries/libmnl/default.nix | 2 +- .../libraries/libmpcdec/default.nix | 2 +- .../development/libraries/libmrss/default.nix | 2 +- .../libraries/libmspack/default.nix | 2 +- .../libmysqlconnectorcpp/default.nix | 2 +- .../libnetfilter_cthelper/default.nix | 2 +- .../libraries/libnfnetlink/default.nix | 2 +- .../development/libraries/libnice/default.nix | 2 +- .../development/libraries/libnxml/default.nix | 2 +- .../development/libraries/libpcap/default.nix | 2 +- .../libraries/libplist/default.nix | 2 +- pkgs/development/libraries/libraw/default.nix | 2 +- pkgs/development/libraries/librep/default.nix | 2 +- .../libraries/libspatialindex/default.nix | 2 +- .../libraries/libspatialite/default.nix | 2 +- .../libraries/libspectre/default.nix | 2 +- .../libraries/libstatgrab/default.nix | 2 +- .../development/libraries/libtiff/default.nix | 2 +- pkgs/development/libraries/libtsm/default.nix | 2 +- .../libraries/libtxc_dxtn/default.nix | 2 +- .../libraries/libusbmuxd/default.nix | 2 +- pkgs/development/libraries/libva/1.0.0.nix | 2 +- .../libraries/libvirt-glib/default.nix | 2 +- pkgs/development/libraries/libx86/default.nix | 2 +- .../libraries/libxcomp/default.nix | 2 +- .../development/libraries/libyaml/default.nix | 2 +- pkgs/development/libraries/libzdb/default.nix | 2 +- .../libraries/loudmouth/default.nix | 2 +- pkgs/development/libraries/mdds/0.12.1.nix | 2 +- pkgs/development/libraries/mdds/default.nix | 2 +- pkgs/development/libraries/mpich2/default.nix | 2 +- .../development/libraries/opendbx/default.nix | 2 +- .../libraries/openldap/default.nix | 2 +- .../development/libraries/openssl/default.nix | 2 +- .../libraries/physics/cernlib/default.nix | 2 +- .../libraries/physics/fastnlo/default.nix | 2 +- .../libraries/physics/herwig/default.nix | 2 +- .../libraries/physics/lhapdf/default.nix | 2 +- .../libraries/physics/mcgrid/default.nix | 2 +- .../libraries/physics/nlojet/default.nix | 2 +- .../libraries/physics/rivet/default.nix | 2 +- .../libraries/physics/thepeg/default.nix | 2 +- .../libraries/physics/yoda/default.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 2 +- .../development/libraries/postgis/default.nix | 2 +- pkgs/development/libraries/proj/default.nix | 2 +- .../rabbitmq-java-client/default.nix | 2 +- .../development/libraries/readosm/default.nix | 2 +- .../development/libraries/rep-gtk/default.nix | 2 +- .../libraries/schroedinger/default.nix | 2 +- .../libraries/science/math/ipopt/default.nix | 2 +- .../libraries/science/math/magma/default.nix | 2 +- pkgs/development/libraries/serd/default.nix | 2 +- .../libraries/shapelib/default.nix | 2 +- pkgs/development/libraries/slang/default.nix | 2 +- pkgs/development/libraries/slib/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- pkgs/development/libraries/sord/default.nix | 2 +- .../libraries/soundtouch/default.nix | 2 +- .../development/libraries/spandsp/default.nix | 2 +- .../libraries/spatialite-tools/default.nix | 2 +- .../libraries/spice-gtk/default.nix | 2 +- .../libraries/spice-protocol/default.nix | 2 +- pkgs/development/libraries/spice/default.nix | 2 +- .../startup-notification/default.nix | 2 +- pkgs/development/libraries/strigi/default.nix | 2 +- .../development/libraries/swiften/default.nix | 2 +- pkgs/development/libraries/sword/default.nix | 2 +- .../libraries/telepathy/farstream/default.nix | 2 +- .../libraries/telepathy/qt/default.nix | 2 +- pkgs/development/libraries/thrift/default.nix | 2 +- pkgs/development/libraries/tre/default.nix | 2 +- pkgs/development/libraries/ucl/default.nix | 2 +- pkgs/development/libraries/unicap/default.nix | 2 +- .../libraries/usbredir/default.nix | 2 +- .../libraries/vaapi-vdpau/default.nix | 2 +- .../development/libraries/vsqlite/default.nix | 2 +- pkgs/development/libraries/wayland/1.9.nix | 2 +- .../libraries/wayland/protocols.nix | 2 +- pkgs/development/libraries/webkitgtk/2.20.nix | 2 +- pkgs/development/libraries/webkitgtk/2.4.nix | 2 +- .../webrtc-audio-processing/default.nix | 2 +- pkgs/development/libraries/x264/default.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- .../libraries/xapian/tools/omega/default.nix | 2 +- .../libraries/xml-security-c/default.nix | 2 +- pkgs/development/libraries/xmlsec/default.nix | 2 +- pkgs/development/libraries/xsd/default.nix | 2 +- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- .../mobile/androidenv/androidsdk.nix | 2 +- .../tools/analysis/egypt/default.nix | 2 +- .../tools/analysis/radare/default.nix | 2 +- .../tools/analysis/radare/ired.nix | 2 +- pkgs/development/tools/cdecl/default.nix | 2 +- pkgs/development/tools/devtodo/default.nix | 2 +- pkgs/development/tools/mdk/default.nix | 2 +- .../tools/misc/babeltrace/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 2 +- .../tools/misc/creduce/default.nix | 2 +- .../development/tools/misc/csmith/default.nix | 2 +- .../tools/misc/eggdbus/default.nix | 2 +- .../tools/misc/intel-gpu-tools/default.nix | 2 +- .../tools/misc/jscoverage/default.nix | 2 +- .../tools/misc/msitools/default.nix | 2 +- .../tools/misc/patchelf/default.nix | 2 +- .../tools/misc/prelink/default.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 2 +- .../development/tools/parsing/antlr/2.7.7.nix | 2 +- pkgs/development/tools/parsing/antlr/3.4.nix | 2 +- pkgs/development/tools/parsing/antlr/3.5.nix | 2 +- pkgs/development/tools/parsing/antlr/4.7.nix | 2 +- .../tools/parsing/ragel/default.nix | 2 +- .../tools/profiling/EZTrace/default.nix | 2 +- .../tools/selenium/chromedriver/default.nix | 2 +- pkgs/development/tools/tradcpp/default.nix | 2 +- pkgs/development/web/csslint/default.nix | 2 +- pkgs/games/airstrike/default.nix | 2 +- pkgs/games/alienarena/default.nix | 2 +- pkgs/games/hedgewars/default.nix | 2 +- pkgs/games/hexen/default.nix | 2 +- pkgs/games/minecraft-server/default.nix | 2 +- pkgs/games/nethack/default.nix | 2 +- pkgs/games/openclonk/default.nix | 2 +- pkgs/games/quake3/content/demo.nix | 2 +- pkgs/games/quake3/content/pointrelease.nix | 2 +- pkgs/games/racer/default.nix | 2 +- pkgs/games/rogue/default.nix | 2 +- pkgs/games/scrolls/default.nix | 2 +- pkgs/games/tennix/default.nix | 2 +- pkgs/games/terraria-server/default.nix | 2 +- pkgs/games/xbomb/default.nix | 2 +- pkgs/games/xmoto/default.nix | 2 +- pkgs/games/xonotic/default.nix | 2 +- pkgs/games/xsnow/default.nix | 2 +- pkgs/games/xsokoban/default.nix | 2 +- pkgs/games/zoom/default.nix | 2 +- pkgs/misc/cups/cups-pk-helper.nix | 2 +- .../drivers/brgenml1cupswrapper/default.nix | 2 +- .../misc/cups/drivers/brgenml1lpr/default.nix | 2 +- pkgs/misc/cups/drivers/canon/default.nix | 2 +- .../cups/drivers/hll2390dw-cups/default.nix | 2 +- pkgs/misc/cups/drivers/kyocera/default.nix | 2 +- .../drivers/mfcj470dwcupswrapper/default.nix | 2 +- .../cups/drivers/mfcj470dwlpr/default.nix | 2 +- .../drivers/mfcj6510dwcupswrapper/default.nix | 2 +- .../cups/drivers/mfcj6510dwlpr/default.nix | 2 +- .../drivers/mfcl2700dncupswrapper/default.nix | 2 +- .../cups/drivers/mfcl2700dnlpr/default.nix | 2 +- .../drivers/mfcl2720dwcupswrapper/default.nix | 2 +- .../cups/drivers/mfcl2720dwlpr/default.nix | 2 +- pkgs/misc/cups/filters.nix | 2 +- .../misc/drivers/foomatic-filters/default.nix | 2 +- pkgs/misc/drivers/gutenprint/bin.nix | 2 +- .../drivers/postscript-lexmark/default.nix | 2 +- pkgs/misc/emulators/bsod/default.nix | 2 +- pkgs/misc/emulators/dlx/default.nix | 2 +- pkgs/misc/emulators/epsxe/default.nix | 2 +- pkgs/misc/emulators/hatari/default.nix | 2 +- pkgs/misc/emulators/higan/default.nix | 2 +- pkgs/misc/emulators/libdsk/default.nix | 2 +- pkgs/misc/screensavers/xautolock/default.nix | 2 +- .../gtk2/gtk-engine-bluecurve/default.nix | 2 +- pkgs/os-specific/linux/atop/default.nix | 2 +- pkgs/os-specific/linux/audit/default.nix | 2 +- pkgs/os-specific/linux/batman-adv/alfred.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/checksec/default.nix | 2 +- .../linux/conntrack-tools/default.nix | 2 +- pkgs/os-specific/linux/criu/default.nix | 2 +- pkgs/os-specific/linux/dmraid/default.nix | 2 +- pkgs/os-specific/linux/dpdk/default.nix | 2 +- .../firmware/b43-firmware-cutter/default.nix | 2 +- .../firmware/intel2200BGFirmware/default.nix | 2 +- pkgs/os-specific/linux/fswebcam/default.nix | 2 +- pkgs/os-specific/linux/ioport/default.nix | 2 +- pkgs/os-specific/linux/iptables/default.nix | 2 +- pkgs/os-specific/linux/keyutils/default.nix | 2 +- .../linux/kmod-debian-aliases/default.nix | 2 +- pkgs/os-specific/linux/kmscon/default.nix | 2 +- .../linux/libvolume_id/default.nix | 2 +- pkgs/os-specific/linux/lm-sensors/default.nix | 2 +- .../linux/multipath-tools/default.nix | 2 +- pkgs/os-specific/linux/musl/default.nix | 2 +- pkgs/os-specific/linux/nftables/default.nix | 2 +- pkgs/os-specific/linux/otpw/default.nix | 2 +- pkgs/os-specific/linux/pam_krb5/default.nix | 2 +- pkgs/os-specific/linux/paxctl/default.nix | 2 +- pkgs/os-specific/linux/plymouth/default.nix | 2 +- pkgs/os-specific/linux/pm-utils/default.nix | 2 +- .../linux/s6-linux-utils/default.nix | 2 +- pkgs/os-specific/linux/smem/default.nix | 2 +- pkgs/os-specific/linux/udisks/1-default.nix | 2 +- pkgs/os-specific/linux/v4l-utils/default.nix | 2 +- pkgs/servers/asterisk/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/dns/knot-dns/default.nix | 2 +- pkgs/servers/dns/knot-resolver/default.nix | 2 +- pkgs/servers/dns/nsd/default.nix | 2 +- pkgs/servers/dns/powerdns/default.nix | 2 +- pkgs/servers/gpsd/default.nix | 2 +- pkgs/servers/h2/default.nix | 2 +- .../tomcat-connectors/default.nix | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/http/jetty/default.nix | 2 +- pkgs/servers/http/lighttpd/default.nix | 2 +- pkgs/servers/http/micro-httpd/default.nix | 2 +- pkgs/servers/http/mini-httpd/default.nix | 2 +- pkgs/servers/http/nginx/generic.nix | 2 +- pkgs/servers/http/openresty/default.nix | 2 +- pkgs/servers/http/redstore/default.nix | 2 +- pkgs/servers/http/thttpd/default.nix | 2 +- pkgs/servers/mail/dovecot/default.nix | 2 +- .../dovecot/plugins/pigeonhole/default.nix | 2 +- pkgs/servers/mail/exim/default.nix | 2 +- pkgs/servers/mail/nullmailer/default.nix | 2 +- pkgs/servers/mail/postfix/pflogsumm.nix | 2 +- pkgs/servers/mail/postgrey/default.nix | 2 +- pkgs/servers/memcached/default.nix | 2 +- .../monitoring/newrelic-sysmond/default.nix | 2 +- pkgs/servers/nosql/riak-cs/2.1.1.nix | 2 +- pkgs/servers/nosql/riak-cs/stanchion.nix | 2 +- pkgs/servers/nosql/riak/2.2.0.nix | 2 +- pkgs/servers/search/groonga/default.nix | 2 +- pkgs/servers/sip/freeswitch/default.nix | 2 +- pkgs/servers/sonarr/default.nix | 2 +- .../sql/postgresql/pgroonga/default.nix | 2 +- .../sql/postgresql/psqlodbc/default.nix | 2 +- pkgs/servers/sslh/default.nix | 2 +- pkgs/servers/uhub/default.nix | 2 +- pkgs/servers/uwsgi/default.nix | 2 +- pkgs/servers/varnish/default.nix | 2 +- pkgs/servers/x11/xorg/default.nix | 2 +- pkgs/servers/xmpp/prosody/default.nix | 2 +- pkgs/shells/mksh/default.nix | 2 +- pkgs/tools/X11/arandr/default.nix | 2 +- pkgs/tools/X11/bumblebee/default.nix | 2 +- pkgs/tools/X11/vdpauinfo/default.nix | 2 +- pkgs/tools/X11/x2vnc/default.nix | 2 +- pkgs/tools/X11/xbindkeys/default.nix | 2 +- pkgs/tools/X11/xbrightness/default.nix | 2 +- pkgs/tools/X11/xdg-user-dirs/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/X11/xpra/gtk3.nix | 2 +- pkgs/tools/admin/ansible/default.nix | 2 +- pkgs/tools/admin/nxproxy/default.nix | 2 +- pkgs/tools/archivers/cabextract/default.nix | 2 +- pkgs/tools/archivers/cromfs/default.nix | 2 +- pkgs/tools/archivers/pxattr/default.nix | 2 +- pkgs/tools/archivers/unarj/default.nix | 2 +- pkgs/tools/archivers/zip/default.nix | 2 +- pkgs/tools/audio/abcmidi/default.nix | 2 +- pkgs/tools/backup/btrbk/default.nix | 2 +- pkgs/tools/backup/chunksync/default.nix | 2 +- pkgs/tools/backup/httrack/default.nix | 2 +- pkgs/tools/compression/bsdiff/default.nix | 2 +- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/compression/lzop/default.nix | 2 +- pkgs/tools/compression/pigz/default.nix | 2 +- .../filesystems/archivemount/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/genimage/default.nix | 2 +- pkgs/tools/filesystems/mtpfs/default.nix | 2 +- .../tools/filesystems/yandex-disk/default.nix | 2 +- pkgs/tools/filesystems/zerofree/default.nix | 2 +- pkgs/tools/graphics/argyllcms/default.nix | 2 +- pkgs/tools/graphics/dcraw/default.nix | 2 +- pkgs/tools/graphics/exiftags/default.nix | 2 +- pkgs/tools/graphics/fgallery/default.nix | 2 +- pkgs/tools/graphics/gifsicle/default.nix | 2 +- pkgs/tools/graphics/gmic/default.nix | 2 +- .../inputmethods/fcitx/fcitx-configtool.nix | 2 +- pkgs/tools/misc/apparix/default.nix | 2 +- pkgs/tools/misc/aws-mturk-clt/default.nix | 2 +- pkgs/tools/misc/bandwidth/default.nix | 2 +- pkgs/tools/misc/bibtex2html/default.nix | 2 +- pkgs/tools/misc/buildtorrent/default.nix | 22 ++++++++--------- pkgs/tools/misc/colord-gtk/default.nix | 2 +- pkgs/tools/misc/colord/default.nix | 2 +- pkgs/tools/misc/convmv/default.nix | 2 +- pkgs/tools/misc/dbacl/default.nix | 2 +- .../tools/misc/desktop-file-utils/default.nix | 2 +- pkgs/tools/misc/ent/default.nix | 2 +- pkgs/tools/misc/flashrom/default.nix | 2 +- pkgs/tools/misc/geekbench/default.nix | 2 +- pkgs/tools/misc/gnokii/default.nix | 2 +- pkgs/tools/misc/gnuvd/default.nix | 2 +- pkgs/tools/misc/goaccess/default.nix | 2 +- pkgs/tools/misc/hdfview/default.nix | 2 +- pkgs/tools/misc/logstash/contrib.nix | 2 +- pkgs/tools/misc/memtest86/default.nix | 2 +- pkgs/tools/misc/mimeo/default.nix | 2 +- pkgs/tools/misc/mpdscribble/default.nix | 2 +- pkgs/tools/misc/mprime/default.nix | 2 +- pkgs/tools/misc/multitail/default.nix | 2 +- pkgs/tools/misc/ncdu/default.nix | 2 +- pkgs/tools/misc/pv/default.nix | 2 +- pkgs/tools/misc/remind/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- pkgs/tools/misc/routino/default.nix | 2 +- pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/misc/s6-portable-utils/default.nix | 2 +- pkgs/tools/misc/t1utils/default.nix | 2 +- pkgs/tools/misc/testdisk/default.nix | 2 +- pkgs/tools/misc/unclutter/default.nix | 2 +- pkgs/tools/misc/usbmuxd/default.nix | 2 +- pkgs/tools/misc/vorbisgain/default.nix | 2 +- pkgs/tools/misc/xdaliclock/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/bwm-ng/default.nix | 2 +- pkgs/tools/networking/chrony/default.nix | 2 +- pkgs/tools/networking/dhcp/default.nix | 2 +- pkgs/tools/networking/dhcping/default.nix | 2 +- pkgs/tools/networking/dnstracer/default.nix | 2 +- pkgs/tools/networking/dropbear/default.nix | 2 +- pkgs/tools/networking/fping/default.nix | 2 +- pkgs/tools/networking/gftp/default.nix | 2 +- pkgs/tools/networking/gvpe/default.nix | 2 +- pkgs/tools/networking/iodine/default.nix | 2 +- pkgs/tools/networking/ip2location/default.nix | 2 +- pkgs/tools/networking/iperf/3.nix | 2 +- pkgs/tools/networking/lftp/default.nix | 2 +- pkgs/tools/networking/miredo/default.nix | 2 +- .../networking/modem-manager/default.nix | 2 +- pkgs/tools/networking/ndisc6/default.nix | 2 +- pkgs/tools/networking/netkit/tftp/default.nix | 2 +- pkgs/tools/networking/netrw/default.nix | 2 +- pkgs/tools/networking/noip/default.nix | 2 +- pkgs/tools/networking/ntp/default.nix | 2 +- pkgs/tools/networking/nylon/default.nix | 2 +- pkgs/tools/networking/rp-pppoe/default.nix | 2 +- pkgs/tools/networking/smokeping/default.nix | 2 +- pkgs/tools/networking/spiped/default.nix | 2 +- pkgs/tools/networking/strongswan/default.nix | 2 +- pkgs/tools/networking/swaks/default.nix | 2 +- pkgs/tools/networking/tinc/default.nix | 2 +- pkgs/tools/networking/trickle/default.nix | 2 +- pkgs/tools/networking/ucspi-tcp/default.nix | 2 +- .../tools/package-management/opkg/default.nix | 2 +- pkgs/tools/security/fprintd/default.nix | 2 +- pkgs/tools/security/gpgstats/default.nix | 2 +- pkgs/tools/security/nasty/default.nix | 2 +- pkgs/tools/security/pass/default.nix | 2 +- pkgs/tools/security/super/default.nix | 2 +- pkgs/tools/security/volatility/default.nix | 2 +- pkgs/tools/system/collectd/default.nix | 2 +- pkgs/tools/system/dfc/default.nix | 2 +- pkgs/tools/system/hardlink/default.nix | 2 +- pkgs/tools/system/htop/default.nix | 2 +- pkgs/tools/system/iops/default.nix | 2 +- pkgs/tools/system/lshw/default.nix | 2 +- pkgs/tools/system/psensor/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 2 +- pkgs/tools/system/stress/default.nix | 2 +- pkgs/tools/system/vbetool/default.nix | 2 +- pkgs/tools/text/colordiff/default.nix | 2 +- pkgs/tools/text/dadadodo/default.nix | 2 +- pkgs/tools/text/enca/default.nix | 2 +- pkgs/tools/text/qprint/default.nix | 2 +- pkgs/tools/text/uni2ascii/default.nix | 2 +- .../tools/text/xml/html-xml-utils/default.nix | 2 +- .../virtualization/ec2-ami-tools/default.nix | 2 +- 606 files changed, 627 insertions(+), 627 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index dfa27aa9f2eb..d21c3fd5efbd 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -5,7 +5,7 @@ name = "mma-${version}"; src = fetchurl { - url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; + url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b74d85b9dbfa..e672e6f3bae1 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { - url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; + url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; }; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 7ac1025c5027..68a9bb63e2e0 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.5"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv"; }; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6e411c8448f6..19cb55d93c98 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "3.9"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; }; diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index d1c0c2afa83b..a3ac2b097e95 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.6.2"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; }; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7f62d53af9ef..29cecb169998 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 32daf000dc59..5f3229dc157c 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2"; src = fetchurl { - url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz"; + url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz"; sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 82c32903bd86..7ff762aa8a0d 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.90.0"; src = fetchurl { - url = "http://calf-studio-gear.org/files/${name}.tar.gz"; + url = "https://calf-studio-gear.org/files/${name}.tar.gz"; sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index be941bc3db29..6c1536c0a610 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; }; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index c42d290c5993..e004e8c847cb 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "drumgizmo-${version}"; src = fetchurl { - url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4"; }; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 36ce40490222..a9d84eb6e6c5 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.9.1"; src = fetchurl { - url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz"; sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; }; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 367b1db139d5..d7a46143939d 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index b92d4f6eb1e8..e9ce20f6c80a 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index b0fbced22113..cacbf428caa0 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.4"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01"; }; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index e4d20db78682..f11bba34c74c 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.73"; src = fetchurl { - url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; + url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz"; sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 99c3e48ae84d..f78110e8bbbf 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 4efdaa86084a..cdf25c08378a 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "japa-${version}"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index d0ffbf29bcb2..296a4f86a848 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa-sdk-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index e41d2ba96750..01acc0d01f7e 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa.h-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 7f368fe6c281..f173e41321f0 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index c7d0caec8bf5..e27aab6e898b 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f511fa659149..60a0695ffecc 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; src = fetchurl { - url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz"; + url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz"; sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; }; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 55f3a667e06f..1b3e89d4885e 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { patches = [ ./buildfix.diff ]; src = fetchurl { - url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; + url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 6b50ee1426ce..e65604e974af 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "nova-filters-${version}"; src = fetchurl { - url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index fe9ed12390a5..5f95a60237f2 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "paprefs-0.9.10"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d113b8a49b31..4f64be02fd52 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "pavucontrol-3.0"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 3670fb8347d6..faa914e13287 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "helmholtz"; src = fetchurl { - url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + url = "https://www.katjaas.nl/helmholtz/helmholtz~.zip"; name = "helmholtz.zip"; curlOpts = "--user-agent ''"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 4f285552576c..37d692a3ab5a 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20160130"; src = fetchurl { - url = "http://www.chnry.net/data/puremapping-${version}-generic.zip"; + url = "https://www.chnry.net/data/puremapping-${version}-generic.zip"; name = "puremapping"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 8b7c2121bd79..d56462ccc844 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.4"; src = fetchurl { - url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 5ec7375056ec..24a2f1a8a601 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; + url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index bdb9911d3650..d5f613b45945 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "http://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index d450cce7b86f..535d53d99eeb 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.8.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; }; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 6bf45f451a5d..3540869f3616 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "x42-plugins-${version}"; src = fetchurl { - url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; + url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index bedc299ee673..799f58e5b68c 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "geany-${version}"; src = fetchurl { - url = "http://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${name}.tar.bz2"; sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 14fdcce1c8e5..5e6406e33f28 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; + "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s"; }; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e8e529b63abc..66112b3498dd 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "monodevelop-${version}"; src = fetchurl { - url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; }; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a23c5242a24b..9af60ca4fcbd 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { name = "netbeans-8.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; + url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; }; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index e9b6f7387632..2f4693982a9c 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.0.5"; src = fetchurl { - url = http://www.scintilla.org/scite405.tgz; + url = https://www.scintilla.org/scite405.tgz; sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index e55bcb48787f..aa3b4b99d7a0 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.02"; src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v"; }; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index b2404df8e56e..a64e9a18e1ad 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 279d83e92193..02e874739efe 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://qgis.org/downloads/${name}.tar.bz2"; + url = "https://qgis.org/downloads/${name}.tar.bz2"; sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g"; }; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c1f15904818f..2d4fa882dd61 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.4.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 98a32ad18995..78772a63dfe3 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.51"; src = fetchurl { - url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf"; }; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 673361c734e1..0bbd543a3076 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -12,7 +12,7 @@ let version = "150"; src = fetchurl { - url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip"; + url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 90f8eec5993a..a881c0fc1f93 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "imlibsetroot-${version}"; version = "1.2"; src = fetchurl { - url = "http://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; + url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; sha256 = "8c1b3b7c861e4d865883ec13a96b8e4ab22464a87d4e6c67255b17a88e3cfd1c"; }; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index b428be1a1ba3..ba64aae62159 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "jpegoptim-${version}"; src = fetchurl { - url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index f1a58d4e21b8..02f5f33f6e6b 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { name = "qiv-${version}"; src = fetchurl { - url = "http://spiegl.de/qiv/download/${name}.tgz"; + url = "https://spiegl.de/qiv/download/${name}.tgz"; sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 42d129e53887..df44c132ed96 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; + url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 80987a8c7411..bca88cc70130 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -6,7 +6,7 @@ assert (stdenv ? glibc); stdenv.mkDerivation { name = "seg3d-1.12_20090930"; src = fetchurl { - url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; + url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8"; }; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 1af165368363..7a49e5b2cb7f 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "zgv-${version}"; version = "5.9"; src = fetchurl { - url = "http://www.svgalib.org/rus/zgv/${name}.tar.gz"; + url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz"; sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index e5e09bf71fd7..0add5ed78cc5 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wavesurfer-1.8.5"; src = fetchurl { - url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; + url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c4c57380be99..b9d4b83e4f1f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "blender-2.79b"; src = fetchurl { - url = "http://download.blender.org/source/${name}.tar.gz"; + url = "https://download.blender.org/source/${name}.tar.gz"; sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 8800ebd83ca0..fd65fcd22606 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; src = fetchurl { - url = "http://calcurse.org/files/${name}.tar.gz"; + url = "https://calcurse.org/files/${name}.tar.gz"; sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; }; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ff1712f12fec..0b2bee9122e0 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.38.4"; src = fetchurl { - url = "http://www.giuspen.com/software/${name}.tar.xz"; + url = "https://www.giuspen.com/software/${name}.tar.xz"; sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2"; }; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 661a00a06616..3851730c4596 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { - url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; + url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix index 341cc8ec2d04..6a36e42eaa3d 100644 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; } else if stdenv.system == "i686-linux" then diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 80f76bc27c89..6fa34a008e77 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "fbreader-0.99.4"; src = fetchurl { - url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; + url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; }; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 43a949ded372..dc70747784cf 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp"; }; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index b6391d06eb92..586807b2dd5c 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "19"; src = fetchurl { - url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; + url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index f581b302c3f4..69c91d257558 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gxneur-0.13.0"; src = fetchurl { - url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; + url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; }; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 525be09d9686..fb17aadfa490 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -4,7 +4,7 @@ let in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + url = "https://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; }; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 90149263644d..ee54904bfd66 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -7,7 +7,7 @@ py.buildPythonApplication rec { version = "0.92"; src = fetchurl { - url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; + url = "https://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836"; }; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 889f516f00b7..7e7850668b84 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 556889e126c0..3cd52af6d321 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - "http://distfiles.macports.org/pstree/${name}.tar.gz" + "https://distfiles.macports.org/pstree/${name}.tar.gz" ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index af74ea570ab3..e1a64c73a123 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ptask-1.0.0"; src = fetchurl { - url = "http://wpitchoune.net/ptask/files/${name}.tar.gz"; + url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; }; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 14680619e0c2..6f38ba5662b5 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sbagen-1.4.4"; src = fetchurl { - url = "http://uazu.net/sbagen/${name}.tgz"; + url = "https://uazu.net/sbagen/${name}.tgz"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; }; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index f64d25471982..1e51ba22ddc3 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; src = fetchurl { - url = "http://taskwarrior.org/download/${name}.tar.gz"; + url = "https://taskwarrior.org/download/${name}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix index 829ed2585627..b41f5c9a0a70 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/misc/tqsl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2.3.1"; src = fetchurl { - url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; }; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index c826bb1dc951..7649785524f1 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.8"; src = fetchurl { - url = "http://waynemorrison.com/software/vcal"; + url = "https://waynemorrison.com/software/vcal"; sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc"; }; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 3ec92adb7f8c..f23862c63cd4 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.1.45"; src = fetchurl { - url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c"; }; diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix index 39da756204f9..897c861e40a1 100644 --- a/pkgs/applications/misc/xneur/0.8.nix +++ b/pkgs/applications/misc/xneur/0.8.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xneur-0.8.0"; src = fetchurl { - url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; + url = https://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; }; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index ae31ebd1ca7e..8df29cef5392 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xtermcontrol-${version}"; src = fetchurl { - url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; + url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 3d12fc037107..300281761a4d 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,7 +6,7 @@ python27Packages.buildPythonApplication rec { version = "3.1.0"; src = fetchurl { - url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; }; diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index b056bdedb41e..73094767bf3d 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "dillo-${version}"; src = fetchurl { - url = "http://www.dillo.org/download/${name}.tar.bz2"; + url = "https://www.dillo.org/download/${name}.tar.bz2"; sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f394df3391ac..aed6987e2738 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { name = "flink-${flinkVersion}"; src = fetchurl { - url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz"; + url = "mirror://apache/flink/${name}/${name}-bin-scala_${hadoopBundle}${scalaVersion}.tgz"; inherit sha256; }; diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 5b543854473d..6274168b3da7 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "kanif-${version}"; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; }; diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 2612e2d9240b..5e79517a5512 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "bro-2.5.4"; src = fetchurl { - url = "http://www.bro.org/downloads/${name}.tar.gz"; + url = "https://www.bro.org/downloads/${name}.tar.gz"; sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0"; }; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index edd7b012e217..6a697790d8f9 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; + url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 713aa8f03744..5fcee73c0f90 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "skype-call-recorder-0.8"; src = fetchurl { - url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; + url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 4fa4967c898e..1ff67d02ff67 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.4"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 89be42781a4c..769e639314e0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.0"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 1791a7ff1ddc..3f22aa28f36f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${project}-0.8.2"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; 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 18b3bb06e98f..7d68f66afc79 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 17cd20c09cbd..bae7231e783f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.1"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 781912f665d5..d7c70232b0ad 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "7.0.0.1035"; src = fetchurl { - url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj"; }; diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index e11f4c65c49a..805b474e814f 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; + url = "https://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy"; }; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index ec67321400dc..2019d9930ef0 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; version = "4.0"; src = fetchurl { - url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; + url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 401eb755896f..9b259cad6d0b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://notmuchmail.org/releases/${name}.tar.gz"; + url = "https://notmuchmail.org/releases/${name}.tar.gz"; sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; }; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 22bfddc5b570..70f74dff3097 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 759cf74ba9d0..bea713c9e6bd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; inherit (source) sha512; }; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index d634502a0352..bf1545ff3983 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "frostwire-${version}"; src = fetchurl { - url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; + url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh"; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 400600751a2e..c56e39826a66 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.20"; src = fetchurl { - url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; + url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a1a1f12a8c1c..2521a4b0daf9 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.1.2.0"; src = fetchurl { - url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; + url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 803e35307fe9..0c793c41c55a 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2016-07-R1"; src = fetchurl { - url = "http://www.kismetwireless.net/code/${name}.tar.xz"; + url = "https://www.kismetwireless.net/code/${name}.tar.xz"; sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 42038426515e..ef1dade4dddd 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; + url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"; }; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index f84058dd4fc3..d689b17fe325 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp"; - url = "http://humdi.net/vnstat/${name}.tar.gz"; + url = "https://humdi.net/vnstat/${name}.tar.gz"; }; buildInputs = [ gd ncurses ]; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 655962ea5b31..b78c0ad09c3d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; src = fetchurl { - url = "http://znc.in/releases/archive/${name}.tar.gz"; + url = "https://znc.in/releases/archive/${name}.tar.gz"; sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0"; }; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 813608a386a4..1dd095e577e8 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "cb2bib"; version = "1.9.7"; src = fetchurl { - url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; + url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index bf963958406d..753f80d61733 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.10"; src = fetchurl { - url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; + url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; sha256 = "1wyv3ny06m6ipb83hi3pzcc50v49zms69c5714iixh0nqpd826f2"; }; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 2258482bd4b2..f204d9bbca96 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "iv-19"; src = fetchurl - { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; + { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; }; nativeBuildInputs = [ patchelf ]; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 7fa229c42b10..35710fd1fe1f 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline python mpi iv ]; src = fetchurl { - url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; + url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 205d56f3fc87..9ecc9f20ac16 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.924"; src = fetchurl { - url = "http://www.veripool.org/ftp/${name}.tgz"; + url = "https://www.veripool.org/ftp/${name}.tgz"; sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx"; }; diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index 87b847087e34..341267b2cebe 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { name = "coq-${version}"; src = fetchurl { - url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; + url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; }; diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 64b0f85aed2a..c3da1205ab0c 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"; }; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 403eff216f53..91ea7e500144 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.5"; src = fetchurl { - url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; + url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; }; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 44328eeb6bbb..9b0ba0799c78 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0"; src = fetchurl { - url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; + url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; sha256 = "1xmwr32pd8lv3f6yh720mdqhi3na505y3zbgcsgh2hwb7b5i3ngb"; }; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index af2bb3ed0c4e..ae04c11d9590 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb"; } else fetchurl { - url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw"; }; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index e30895346258..be337a1c258e 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchurl { - url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; + url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; }; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index ec717002c2d6..6d9549b526f9 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "mcrl2-${version}"; src = fetchurl { - url = "http://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; + url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index b143fd982505..01dfc35f6e0d 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { version = "0.12"; src = fetchurl { - url = "http://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; + url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 74e31d062f48..f96532b7038b 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "prover9-2009-11a"; src = fetchurl { - url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; + url = https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3"; }; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index c22bff9cdee2..b9dd90f601f5 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { buildInputs = [ocaml zlib which eprover makeWrapper coq]; src = fetchurl { - url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 953f4e62c22b..f20b75605d5a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "R-3.5.0"; src = fetchurl { - url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; + url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; }; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 6de77d81be6f..689261abc661 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + url = "https://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 796e8b7264fb..9b402fe0ac94 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "csdp-6.1.1"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 798141b6b438..a53829347053 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glsurf-3.3.1"; src = fetchurl { - url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 07c6af0926d6..a811c9da8c27 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.9.5"; src = fetchurl { - url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; }; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index b3e36b6bf206..10b0d0cba36d 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.0.10pl1"; src = fetchurl { - url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav"; }; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index b74bcc3d6377..7f101bac147e 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -52,26 +52,26 @@ stdenv.mkDerivation rec { "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz" "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz" "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz" - "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" + "https://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz" - "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" + "https://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz" "http://files.sagemath.org/src/sage-${version}.tar.gz" - "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" + "https://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz" "http://linorg.usp.br/sage/src/sage-${version}.tar.gz" "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz" - "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" + "https://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz" - "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" - "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" - "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" + "https://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz" - "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" - "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" - "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" - "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" - "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" + "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" + "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" + "https://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" + "https://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" + "https://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz" "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz" "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz" diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 154f1ba39e3c..ad0231d37b0e 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit name; src = fetchurl { - url = "http://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; + url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.system == "i686-linux" then "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a" diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bb52b430f8cb..fcdbb6b985d6 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "4.1.2"; name = "scilab-${version}"; src = fetchurl { - url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz"; + url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz"; sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 3b01c684d529..8fa020ba07c9 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison openmpi flex zlib ]; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; sha256 = "f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7"; }; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 6c25f720ebf9..64b88dcc3d4f 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz"; + url = "https://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz"; sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 340428e8e777..66a9bebacf0d 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.5"; src = fetchurl { - url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5"; }; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 3edf75a4bffe..1d933d569486 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { name = "gazebo-${version}"; src = fetchurl { - url = "http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; + url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; sha256 = src-sha256; }; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index ade8af254496..8c442f31cd14 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "recoll-${ver}"; src = fetchurl { - url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; + url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz"; sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index d890001489ff..a6efb8d339e9 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; }; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index f2786b15f344..1535d88026a3 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "redmine-${version}"; src = fetchurl { - url = "http://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${name}.tar.gz"; sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; }; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 4d41cad0d8e6..dc202e9e7b49 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { urls = [ "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" + "https://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" ]; sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 1e671b4ea7bf..6281c7884015 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dvb-apps-7f68f9c8d311"; src = fetchurl { - url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; + url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82"; }; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 9fcb88c2aaa0..bf77e1d35472 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xawtv-3.104"; src = fetchurl { - url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; sha256 = "0jnvbahxmx9jw8g2519wmc1dq9afnlqcrzc876fcbf2x1iz39qxr"; }; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 9c16733e4a07..b12e7bd5f470 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spice-vdagent-0.18.0"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index da092bed47be..883cd1c867a1 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { name = "virtualbox-${version}"; src = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = main; }; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index b2e34a016adc..6f3505056c37 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "herbstluftwm-0.7.0"; src = fetchurl { - url = "http://herbstluftwm.org/tarballs/${name}.tar.gz"; + url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy"; }; diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 17084d6a6a70..635265b04abc 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmatchbox ]; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1"; }; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index c219c81c2a50..887a58b748da 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceName = "sawfish_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 298031b8b305..d967f55b81c8 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50"; }; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index cbca697cb262..5dc8e53282ab 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "clearlyU-12-1.9"; src = fetchurl { - url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz; + url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz; sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 5ebb365ecdfb..b2207e01df1a 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "proggyfonts-0.1"; src = fetchurl { - url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; + url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 03c5be143ded..2c0872188e02 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hicolor-icon-theme-0.17"; src = fetchurl { - url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; + url = "https://icon-theme.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index ac015c02b199..e48470a67bb7 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "freepats-20060219"; src = fetchurl { - url = "http://freepats.zenvoid.org/${name}.tar.bz2"; + url = "https://freepats.zenvoid.org/${name}.tar.bz2"; sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"; }; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d7a5ce33bd26..d14ccdec2ead 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "poppler-data-0.4.9"; src = fetchurl { - url = "http://poppler.freedesktop.org/${name}.tar.gz"; + url = "https://poppler.freedesktop.org/${name}.tar.gz"; sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; }; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index eda895d726a0..ce754813dda1 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.28"; src = fetchurl { - url = "http://lionet.info/soft/asn1c-${version}.tar.gz"; + url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; }; diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index ad9e57f794f0..ceeff56330b2 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { binaryVersion = 8; src = fetchurl { - url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 3fed2289f954..16ac8b787219 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; + url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ffbe3c5a62f4..61b24a851941 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.13.0.6"; src = fetchurl { - url = "http://www.colm.net/files/colm/${name}.tar.gz"; + url = "https://www.colm.net/files/colm/${name}.tar.gz"; sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26"; }; diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 6ea21207f19f..675522d54ead 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "gforth-${version}"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index c2352b8126e0..048dd598a480 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "14.01.1"; src = fetchurl { - url = "http://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; + url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq"; }; diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 929d00491382..c8afd0dcc906 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index a62f2f24dd87..e39de76117af 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { inherit sha256; - url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 1676ce4884d9..a0daa7df1737 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.13.03"; src = fetchurl { - url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33"; }; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index ab71090b3580..9eec23f1ba88 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; + url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878"; } else if stdenv.system == "i686-linux" then diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index ca21612776f0..99a65dec1501 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { version = "3.10.0"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index df62cd3656b4..e65510c172e6 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.11.2"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 8cfe2bb7bcfe..8636f670059c 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.12.1"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; }; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 8bad5494e8b9..0a30ef1352c4 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "4.00.1"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index 81c8cd534025..16d7e2580b38 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "104"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb"; }; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index d7590146e2ad..94b89cf3a952 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -5,7 +5,7 @@ let fname = "pakcs-1.14.0"; fsrc = fetchurl { - url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; + url = "https://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s"; }; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 86b6a942403b..16e0389ad031 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.10.7"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; }; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 1145ebab5245..b1100eb8aa9d 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.11.12"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; }; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 92690649bff6..8a20066becb7 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.12.6"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs"; }; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index d93da8cb9965..7c6b545285cc 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "yap-${version}"; src = fetchurl { - url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 738b63fe1ad7..5aea623b91d4 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "yasm-1.3.0"; src = fetchurl { - url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; + url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 1d94fd33a72c..be49d2dd9215 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lua-4.0.1"; src = fetchurl { - url = http://www.lua.org/ftp/lua-4.0.1.tar.gz; + url = https://www.lua.org/ftp/lua-4.0.1.tar.gz; sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; }; diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index a9e725f128bc..d343ec6c63b1 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lua-5.0.3"; src = fetchurl { - url = http://www.lua.org/ftp/lua-5.0.3.tar.gz; + url = https://www.lua.org/ftp/lua-5.0.3.tar.gz; sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671"; }; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 15077578f27f..271490c99574 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { luaversion = "5.1"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index acddbcfd303c..6221bf3fb843 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "${luaversion}.3"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index e2b64fd4e028..37a5bdd0ce94 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "picoLisp-${version}"; version = "16.12"; src = fetchurl { - url = "http://www.software-lab.de/${name}.tgz"; + url = "https://www.software-lab.de/${name}.tgz"; sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index b67ad3db2ef5..18bc875fb334 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec { name = "pyrex-${version}"; src = fetchurl { - url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; }; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 7a0ac5a1e229..2feb15b647da 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec { name = "pyrex-${version}"; src = fetchurl { - url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; }; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index e15e0926aedf..25e125b9af63 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rascal-0.6.2"; src = fetchurl { - url = "http://update.rascal-mpl.org/console/${name}.jar"; + url = "https://update.rascal-mpl.org/console/${name}.jar"; sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6"; }; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index ea72bfb434b8..7fecae0a66e7 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.8.3"; src = fetchurl { - url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; }; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index d40b25cd8040..c7e4a9c29ac8 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { version = "1.2.15"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index c32f59636a92..5e01a83b7c0c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "2.0.8"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index ea5f37513afb..17a2dd14b272 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.3"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index f31fe33ea096..3819aeb3c316 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 5cadfb9d9051..1cb74ac1b2d3 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.1"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 83a2ffc077c3..68c8c16ed4e8 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.26"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index c8cab33ed57f..56701e80b1f3 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.12"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index e471c3cc556f..2a009a3b7104 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; src = fetchurl { - url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index f98e4a3b0ad3..cf6b53021f79 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.11"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 3db15892a144..0f0e30ef0f3b 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" + "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 51ae14be4046..adcb86cedf84 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aubio-0.4.6"; src = fetchurl { - url = "http://aubio.org/pub/${name}.tar.bz2"; + url = "https://aubio.org/pub/${name}.tar.bz2"; sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 427625d6fc67..710c5b1a92cb 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.24.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index d30cb1d369eb..4709d0348537 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 63f43ac7a2c0..e29c7b5cb122 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { - url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 182471acf4ae..1ed457aa5fe1 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://audiofile.68k.org/${name}.tar.gz"; + url = "https://audiofile.68k.org/${name}.tar.gz"; sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f3e7fc7f1621..a82f4e7dfdae 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babl-0.1.50"; src = fetchurl { - url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m"; }; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index a384a7707832..6f9b94fc872b 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "c-ares-1.14.0"; src = fetchurl { - url = "http://c-ares.haxx.se/download/${name}.tar.gz"; + url = "https://c-ares.haxx.se/download/${name}.tar.gz"; sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 44cdfc4e0eef..4486149cfcef 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { - url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; }; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 09d162db8532..47250f2b3da2 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "https://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 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 7b48ffcaccf8..0690bd425aec 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index fd8fa1a994d6..d50aca1679b8 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; src = fetchurl { - url = "http://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; + url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 06dde2ad4078..fb1292181756 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { name = "db-${version}"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "https://download.oracle.com/berkeley-db/${name}.tar.gz"; sha256 = sha256; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4f6bd829099f..ade6c98df942 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -14,7 +14,7 @@ self = stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 8841855a24ed..015aeaed55ba 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${v}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj"; }; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 7de05926da59..e6d13a5915a1 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; }; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 4e1559e5c738..c120132dcb8b 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; }; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 1f58fd698da3..ac2c21d4cf0e 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "exempi-2.4.5"; src = fetchurl { - url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e15f2583f4da..813ea0504653 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; }; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 7a80ce7fdb66..7d0b70ec627e 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz"; sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; }; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 161153b7e3dc..287c33243865 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "gegl-0.3.34"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; }; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index e9230b218be9..623ee5b3375c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "gegl-${version}"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba"; }; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 4d348c92171b..eb7a6d6aaf21 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "geoclue-2.4.8"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; }; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 24e3b4842faf..b92f6e61f56a 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "geos-3.6.2"; src = fetchurl { - url = "http://download.osgeo.org/geos/${name}.tar.bz2"; + url = "https://download.osgeo.org/geos/${name}.tar.bz2"; sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 7ab06afdad61..1a449f57be7f 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd"; }; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 1980c633474f..dd72637f2eb0 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" - "http://www.linas.org/gle/pub/gle-3.1.0.tar.gz" + "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz" ]; sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index b6de369a1ec3..eeeff731a6e3 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { - url = "http://camaya.net/download/gloox-${version}.tar.bz2"; + url = "https://camaya.net/download/gloox-${version}.tar.bz2"; sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; }; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 36da2fb72aa4..d0a2d3691b49 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -6,7 +6,7 @@ let version="1.4"; name="${baseName}-${version}"; hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; - url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip"; + url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 81a2c8691796..7c67ab48ad4c 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; + url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; sha256 = "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1"; }; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 82a4ec337555..a48908f41dd4 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx"; - url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index cdb018d297b6..20a60f1a102d 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 23adfd80caac..daee9adb1fdc 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { - url = http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; + url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 13b4df395e50..6af8885464a3 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 877535331698..ad5192f94ce2 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 6435e9fc32da..321ebb46e463 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jbigkit-2.1"; src = fetchurl { - url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 1e7720b0656a..de796307de1a 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { - url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; + url = "https://download.osgeo.org/liblas/${name}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 187e06239c10..fe2229bcea6a 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 5f0b1ccd18ec..ef5838188593 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libantlr3c-3.4"; src = fetchurl { - url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index aab8fcd4beb8..eebe667badb9 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.5-rc2"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2"; sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index ff9412ceb580..36410e842a5d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.7"; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 6d8cafcfaa60..8b5130b0eac8 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libcdr-0.1.4"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.xz"; sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; }; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index ea27046279c7..6d37eb19c712 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; }; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 3386b081a104..ce67a8efa80e 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.9.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 7b4d39f955aa..81122a6eb520 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { }; src = fetchurl { - url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; + url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43"; }; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index fc0221b93889..5a0006ad6c6e 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "http://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${name}.tar.gz"; sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index a09e48dcc1d9..c94806b50c10 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4d1b4e4c3fdc..93ef1957d2cd 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libdrm-2.4.92"; src = fetchurl { - url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; + url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79"; }; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 6057dae4be2e..e81ea18103dc 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -3,7 +3,7 @@ let version = "20180129"; src = fetchurl { - url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; + url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 5f422f7018b8..5127231dab60 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libeatmydata-105"; src = fetchurl { - url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; }; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 4b233301cce7..b5b2b8e37349 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libebml-1.3.5"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; }; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index da4bbcad4fb6..bc4cea1b4702 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; src = fetchurl { - url = "http://thrysoee.dk/editline/${name}.tar.gz"; + url = "https://thrysoee.dk/editline/${name}.tar.gz"; sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; }; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 0ba703585bbb..8d264c929a5b 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libexttextcat-3.4.5"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 6aca1d2be6d6..fa04655341d4 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index c6deb1fc9291..b59bf9a06ac5 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "libftdi1-1.4"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index f90e741a57e9..74b87a46ef0a 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 79f49c629b86..05c320c42aec 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libgdiplus-2.10.9"; src = fetchurl { - url = "http://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; }; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 3d49fa064509..48a1490caecf 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libgeotiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 90d41e30502f..08fce9c521ec 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 3b4e3233d554..bf08db6d3b7b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4"; }; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index fcecd3a9d132..798aef8e7da7 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libX11 libXext libpng ]; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15"; }; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 1b17ff0dd433..8e429875b36b 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile ]; src = fetchurl { - url = "http://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 764f4442e6cb..e7bce0e80187 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 2dbdb60b4b66..7c4b451ae6d1 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmnl-1.0.4"; src = fetchurl { - url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; }; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 084d7ba73704..a5a4d68ad969 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmpcdec-1.2.6"; src = fetchurl { - url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b0adcf237549..f1a061e5ab58 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmrss-0.19.2"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; + url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 79d4c056341c..ef250441daba 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmspack-0.6alpha"; src = fetchurl { - url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"; }; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 9eefbcfdb49e..2b7258031c33 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.9"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; + url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index fa94fa549e42..a680e009ab6a 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 5395b5b2e99c..fa6461d86919 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnfnetlink-1.0.1"; src = fetchurl { - url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index c7967c3fb6fc..cdf93b0b2ff4 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnice-0.1.14"; src = fetchurl { - url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; + url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; }; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index f34c421a120a..8d97a13b0a08 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libnxml-0.18.3"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; + url = "https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; sha256 = "0ix5b9bxd7r517vhgcxwdviq4m0g0pq46s5g3h04gcqnpbin150g"; }; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 945554386930..f94f327ea02e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libpcap-1.8.1"; src = fetchurl { - url = "http://www.tcpdump.org/release/${name}.tar.gz"; + url = "https://www.tcpdump.org/release/${name}.tar.gz"; sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; }; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index d8ebc2e83a61..8da097c3d386 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; }; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 3ce4b3f2d3f9..9803e09610e6 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.18.12"; src = fetchurl { - url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; + url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; }; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 5b3beda1eb8b..2f78222cebb1 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceName = "librep_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz"; sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index aa3aaa1c59bc..8018b84a52be 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; + url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 253c5365c8a3..b75baf149e1a 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialite-4.3.0a"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 647e6f16fdf8..f1e4169bd48e 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libspectre-0.2.7"; src = fetchurl { - url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; + url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz"; sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 72d73e358485..fb7b3be6b698 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libstatgrab-0.91"; src = fetchurl { - url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6676944d5291..c492a15bfa4e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; + url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"; }; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 58b052b8fae8..18ceb5302292 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtsm-3"; src = fetchurl { - url = "http://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 977570050158..21e3a15449c2 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-${version}"; src = fetchurl { - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 3d15b698b481..ae53178e88d9 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libusbmuxd-1.0.10"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; }; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 04d621e29c84..097ac0e3e98e 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0dbe30251bdd..2d83955de696 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://libvirt.org/sources/glib/${name}.tar.gz"; + url = "https://libvirt.org/sources/glib/${name}.tar.gz"; sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index d73d67a39cf2..d56c20cb75af 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libx86-${version}"; version = "1.1"; src = fetchurl { - url = "http://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index d225831f7024..b4ad501c2efe 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 20053190e3bc..150da3d45997 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { - url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; + url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 4a5aa057a5cf..f3cbddf1ec41 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec src = fetchurl { - url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; }; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 762d23e240a2..e014e38c3f97 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "loudmouth-${version}"; src = fetchurl { - url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 1c6134d0480b..11bd437d377e 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 592b6d7a6779..90d86ea9165c 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; }; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 4b8e2b651e45..6c5a0e5279ce 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; src = fetchurl { - url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; + url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax"; }; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 48ec5141e34f..20a62ef67f98 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "opendbx-1.4.6"; src = fetchurl { - url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; + url = "https://linuxnetworks.de/opendbx/download/${name}.tar.gz"; sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 93ba3f15a09c..907f071d5c55 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openldap-2.4.45"; src = fetchurl { - url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; + url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 31e9d661a588..0251de77d03e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -12,7 +12,7 @@ let name = "openssl-${version}"; src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index dad138c8433a..f837d807219f 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "cernlib-${version}"; src = fetchurl { - url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e568e1597972..e3291907d31f 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.1pre-2402"; src = fetchurl { - url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index ce6ea4c56a89..9993060eb728 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 93e0fa99c347..7f89c92772c3 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6.2.1"; src = fetchurl { - url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; }; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index aabe132e73b3..32a05d10d3a6 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 88fafaf3ae6e..0c9d879fbd09 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; src = fetchurl { - url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; + url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; }; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c13b659f792e..8c4a9288a15b 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.6.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 0a84fe20da72..feffa5c11d54 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; }; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6cda6bd310be..eb34b94118a9 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 98937308191e..2b5f7cacd4b3 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "polkit-0.113"; src = fetchurl { - url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; + url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 9a72e03ef2c6..aa9a3f9fdc0a 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { name = "postgis-${version}"; src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index b92aa49a092e..0ebf299a8bfb 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proj-4.9.3"; src = fetchurl { - url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz; + url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz; sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index a1708ba59c35..96a2347c50fa 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; + url = "https://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 7faee7e69a2e..5a4306a63a78 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "readosm-1.1.0"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 5629164f160a..681fc3a012fe 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sourceName = "rep-gtk_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 167fe4190764..25126edbc0f4 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz - http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz + https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz ]; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 0af00f75d994..4a6aabb447f3 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.12.10"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; + url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9"; }; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 26ec501f1a7e..8444d88809af 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -7,7 +7,7 @@ let version = "2.0.2"; in stdenv.mkDerivation { name = "magma-${version}"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; name = "magma-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 96449a8ed962..ac9183cffe9b 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.28.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; }; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 3234d1bb89bf..09d3efa64b2b 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.1"; src = fetchurl { - url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index bcce457e78e8..ec59ae0e819e 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "slang-2.3.2"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2"; + url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2"; sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 233ba91d299a..665f025ffcf3 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "slib-3b5"; src = fetchurl { - url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; + url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; }; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 17195febe133..1b5564dc1590 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "snack-2.2.10"; src = fetchurl { - url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; + url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 995ac631580d..207c6f2d30a1 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.16.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index c338d6762a4d..95a97f30b6e6 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pName = "soundtouch"; name = "${pName}-2.0.0"; src = fetchurl { - url = "http://www.surina.net/soundtouch/${name}.tar.gz"; + url = "https://www.surina.net/soundtouch/${name}.tar.gz"; sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index ea3013c78bcb..be2fc503e390 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.0.6"; name = "spandsp-${version}"; src=fetchurl { - url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; + url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; buildInputs = []; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ff461f1b8e64..9070423d8c76 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 21359c4f0d0b..aeab43c889d6 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 19b68a0c43de..fc337f22b56f 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spice-protocol-0.12.14"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; }; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ee54ad555537..0b815f9095f9 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "spice-0.14.0"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; }; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index ce4fca6da70d..fc771a493b6d 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "libstartup-notification-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; + url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 362881a2f42b..63060bf55533 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.7.8"; src = fetchurl { - url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 810420fe6b76..1759258e6664 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl boost ]; src = fetchurl { - url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 13497f7727f4..0c3bb3b13064 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.7.4"; src = fetchurl { - url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 41308a7ef4ec..fae51aea477e 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-farstream"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 90dd47c11e2f..24dc3667d172 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "telepathy-qt-0.9.7"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; }; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 45e5174ed573..cb200b82e207 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.11.0"; src = fetchurl { - url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 25d7849b1b4b..12f7e4c765d2 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "tre-0.8.0"; src = fetchurl { - url = "http://laurikari.net/tre/${name}.tar.gz"; + url = "https://laurikari.net/tre/${name}.tar.gz"; sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index aa983b1394b1..933a3afef35b 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ucl-1.03"; src = fetchurl { - url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; + url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 604a1b7012af..1aa5e6717021 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version="0.9.12"; src = fetchurl { - url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 515c3b2ca3b9..25ddfb355241 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.1"; src = fetchurl { - url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 013af68cb6c4..07ca9d2e62e1 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index bfb07c2df337..e706c730ddd3 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.13"; src = fetchurl { - url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index efb365958eb8..d832becbed88 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.9.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 4bb7cd153cf3..33bce4d6216f 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.14"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index d3fffa2dd32f..e234e3e66ad9 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 39a76a74711f..1a17ae53313b 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 529091518eb6..056ab8c51387 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "webrtc-audio-processing-0.3"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm"; }; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 06ed123c7356..276f509772c2 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "x264-${version}"; src = fetchurl { - url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; + url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 482c765dcda9..5dd81af2b1af 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -7,7 +7,7 @@ let passthru = { inherit version; }; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 17855011297e..1203f19d6c82 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (xapian) version; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index bbbf9af29e58..fec4bbe8efe2 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; }; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index e17ac6d15075..94f1d187267e 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { - url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; + url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index bef2e46e0736..051a194af98e 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; + url = "https://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc"; }; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index de2e0b62f9e2..b8537896d791 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = - [ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path + [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 84020a5ac2d5..7da0fc148d42 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -26,7 +26,7 @@ let }; "2.8" = { - url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; + url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a90c9f8476e3..8d9f87b6d079 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 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"; + url = "https://dl.google.com/android/repository/tools_r${version}-linux.zip"; sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; } else if stdenv.system == "x86_64-darwin" then fetchurl { diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index a7f29017fbe0..07bcd57a121a 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -6,7 +6,7 @@ buildPerlPackage rec { src = fetchurl { sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m"; - url = "http://www.gson.org/egypt/download/${name}.tar.gz"; + url = "https://www.gson.org/egypt/download/${name}.tar.gz"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index f2079b2b5a10..b174d6c069b7 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "radare-1.5.2"; src = fetchurl { - url = "http://radare.org/get/${name}.tar.gz"; + url = "https://radare.org/get/${name}.tar.gz"; sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd"; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index a2d135d44841..aec13296bdaa 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ired-0.4"; src = fetchurl { - url = "http://radare.org/get/${name}.tar.gz"; + url = "https://radare.org/get/${name}.tar.gz"; sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm"; }; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index c5bccf6ddae6..388f6b0db439 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "cdecl-2.5"; src = fetchurl { - url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; }; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index a0b0ee571d95..dcaa43156699 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.20"; src = fetchurl { - url = "http://swapoff.org/files/devtodo/${name}.tar.gz"; + url = "https://swapoff.org/files/devtodo/${name}.tar.gz"; sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; }; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 37c5dab8ce87..8b5bea7ac6ce 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.9"; src = fetchurl { - url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; + url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 48cf4b31a176..b2130118fed9 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babeltrace-1.5.5"; src = fetchurl { - url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; + url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0"; }; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index a5ad3910f3f0..32c888b7e62f 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "http://cgdb.me/files/${name}.tar.gz"; + url = "https://cgdb.me/files/${name}.tar.gz"; sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; }; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index cbf5883b2973..a3c5fd7f009c 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.7.0"; src = fetchurl { - url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz"; sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; }; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index c4994ad24d79..a0040e4ed3e5 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0"; src = fetchurl { - url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz"; sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; }; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 9f0ea147b585..3b1c70b4ac33 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "eggdbus-0.6"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 5176be123018..08729f6b41b2 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "intel-gpu-tools-1.22"; src = fetchurl { - url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; + url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix"; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index cb7d9af86e7d..af660561ee17 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; src = fetchurl { - url = "http://siliconforks.com/jscoverage/download/${name}.tar.bz2"; + url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2"; sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"; }; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index ecee27c13858..ebba56d56d3b 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 1982a25e3df0..39ec46ffbfdd 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "patchelf-0.9"; src = fetchurl { - url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; }; diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index ccd0b15a46d2..89b1ed6ee40c 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; + url = "https://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3"; }; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 90aec83be986..fc1513ecf34b 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { version = "0.23.6"; src = fetchurl { - url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg"; diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 017ef20e81c6..cafb076aa811 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "antlr-2.7.7"; src = fetchurl { - url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz"; + url = "https://www.antlr2.org/download/antlr-2.7.7.tar.gz"; sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; }; patches = [ ./2.7.7-fixes.patch ]; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index e6765806e4f7..c892b8fa8eab 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "3.4"; src = fetchurl { - url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; }; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 5e10003dd6f9..030a19e99405 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "3.5.2"; src = fetchurl { - url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index f58d0f9904aa..e097b5b3d5a5 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "4.7.1"; src = fetchurl { - url ="http://www.antlr.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index cd1cb0efd123..f418229f893b 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -8,7 +8,7 @@ let name = "ragel-${version}"; src = fetchurl { - url = "http://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 98b38697992d..2ff337ef2083 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "EZTrace-${version}"; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz"; sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr"; }; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 82724924a4a8..a2cd55f52b90 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "2.40"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; + url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; sha256 = spec.sha256; }; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 3891617e1c79..8cde662b14c3 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + url = https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4e8cb2b8829c..4159e3690490 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "csslint-${version}"; src = fetchurl { - url = "http://registry.npmjs.org/csslint/-/${name}.tgz"; + url = "https://registry.npmjs.org/csslint/-/${name}.tgz"; sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 24f71a5c6a16..a0bbd3b1c671 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6a"; src = fetchurl { - url = "http://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz"; + url = "https://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz"; sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi"; }; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 1b23d1ccd6d2..628a521126f5 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "alienarena-7.65"; src = fetchurl { - url = "http://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz"; + url = "https://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz"; sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 52f476fa447d..2852c6869af2 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "0.9.24.1"; name = "hedgewars-${version}"; src = fetchurl { - url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; + url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1"; }; diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix index 7dfb4cf9d3a9..48379da3a0a4 100644 --- a/pkgs/games/hexen/default.nix +++ b/pkgs/games/hexen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "hexen-0.2.3"; src = fetchurl { - url = http://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz; + url = https://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz; sha256 = "c1433e930f2003c5f817f935406bb28ba15298a15b1c11f83f42df3e9f1f3bc4"; }; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 16e0c05e0e2c..59e1144cf967 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.12.2"; src = fetchurl { - url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; + url = "https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; }; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 9dd76581fd8b..1ad7565f4508 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { name = "nethack-3.6.1"; src = fetchurl { - url = "http://nethack.org/download/3.6.1/nethack-361-src.tgz"; + url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; }; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index e4bcef29878c..fa0411196318 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "openclonk-${version}"; src = fetchurl { - url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; + url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 2b4e69f0086c..88ba8679e8a7 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "quake3-demodata-${version}"; src = fetchurl { - url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; + url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4"; }; diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index 04da5811d99a..f35aaaad3527 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "quake3-pointrelease-${version}"; src = fetchurl { - url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; + url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; sha256 = "11piyksfqyxwl9mpgbc71w9sacsh4d3cdsgia0cy0dbbap2k4qf3"; }; diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index db0b81f5567a..4cbc5397bb3e 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = http://hippo.nipax.cz/src/racer-1.1.tar.gz; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = http://hippo.nipax.cz/src/racer-1.1.64.tar.gz; + url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else throw "System not supported"; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 40f0b1754941..bb93fafa3b50 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "https://src.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" ]; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 5f1e1a17553b..b8bf4efcf0aa 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://download.scrolls.com/client/linux.tar.gz"; + url = "https://download.scrolls.com/client/linux.tar.gz"; sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec"; }; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 4260ded0d6ff..283d8ad21d7e 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "tennix-1.1"; src = fetchurl { - url = "http://icculus.org/tennix/downloads/${name}.tar.gz"; + url = "https://icculus.org/tennix/downloads/${name}.tar.gz"; sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 65dc77fbf16f..13d296e5961a 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { - url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; + url = "https://terraria.org/server/terraria-server-${urlVersion}.zip"; sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 787aebef2d54..946bff79f975 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "xbomb-2.2b"; src = fetchurl { - url = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; + url = "https://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; }; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index ffb3a0227d9e..ef8c5a09cae9 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.5.11"; src = fetchurl { - url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; + url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; }; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 7fd5612bf886..6d9ae55e639c 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "xonotic-0.8.2"; src = fetchurl { - url = "http://dl.xonotic.org/${name}.zip"; + url = "https://dl.xonotic.org/${name}.zip"; sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"; }; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 2f898a5aed39..47a321c99b4a 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "xsnow-${version}"; src = fetchurl { - url = "http://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; + url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 814241244e31..3e9add56903c 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.3c"; src = fetchurl { - url = "http://www.cs.cornell.edu/andru/release/${name}.tar.gz"; + url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz"; sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index d6e79289525d..449d7ae6e2d5 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "zoom-1.1.5"; src = fetchurl { - url = "http://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; + url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 91f5af1062c1..f0be3cad723c 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "cups-pk-helper-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index db60ece128f5..4464b5ba11b3 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { name = "brgenml1cupswrapper-3.1.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101125/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb"; sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r"; }; diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index bd069b0d65a9..51ef47fe4693 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { name = "brgenml1lpr-3.1.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101123/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb"; sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f"; }; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index b79ffa1c9a12..351a64abd331 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -7,7 +7,7 @@ let i686_glibc = callPackage_i686 ({glibc}: glibc) {}; src_canon = fetchurl { - url = "http://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; + url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; sha256 = "1qpdmaaw42gm5fi21rp4lf05skffkq42ka5c8xkw8rckzb13sy9j"; }; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index cda4ed6304d2..8357a452a2b1 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. # Though this builds only supports x86_64 for now. - url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; }; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index db787021ce03..0711bad86a1e 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { # this site does not like curl -> override useragent curlOpts = "-A ''"; - url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; }; diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 5a828c265b55..72a40f41f885 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz"; + url = "https://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz"; sha256 = "b88f9b592723a00c024129560367f40a560ca3cba06fd99512ab368dd6855853"; }; diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index c80009bd8444..c5b63b07318d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a"; }; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index fbb523409187..4b31ccf38774 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz"; + url = "https://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz"; sha256 = "0y5iffybxjin8injrdmc9n9hl4s6b8n6ck76m1z78bzi88vwmhai"; }; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 228f56d47ae0..40e65136f1b0 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb"; sha256 = "1ccvx393pqavsgzd8igrzlin5jrsf01d3acyvwqd1d0yz5jgqy6d"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 3b1d2e52881a..1673c2d5c5c8 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mfcl2700dncupswrapper-${meta.version}"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index b0a030469349..8e31cd2956a5 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb"; sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index d45b53b5b80b..2099291d434b 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101802/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb"; sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 7791d71114b4..8dbc56fe846d 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101801/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb"; sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af"; }; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 2195cf7d2a39..d15680b63639 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { version = "1.20.3"; src = fetchurl { - url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; + url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; }; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index d6ac4fd6a03c..99286d5f2047 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; src = fetchurl { - url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; + url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz"; sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 021852f3505c..3832c4de2dcc 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; + url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc"; } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index f6ddc61b5157..f41104580626 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "postscript-lexmark-${version}"; src = fetchurl { - url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; + url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm"; }; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index f4b4db497e2d..8575d654febf 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsod-0.1"; src = fetchurl { - url = http://www.vanheusden.com/bsod/bsod-0.1.tgz; + url = https://www.vanheusden.com/bsod/bsod-0.1.tgz; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 561f14b5554f..358cc59d3db0 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dlx-2012.07.08"; src = fetchurl { - url = "http://www.davidviner.com/zip/dlx/dlx.zip"; + url = "https://www.davidviner.com/zip/dlx/dlx.zip"; sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn"; }; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 2f11384d845a..a0999e6caf52 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version2 = concatStrings (splitString "." version); platform = "linux" + (optionalString stdenv.is64bit "_x64"); in fetchurl { - url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; + url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; sha256 = if stdenv.is64bit then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0" else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl"; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 440eb681eb38..287df4db01be 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hatari-2.1.0"; src = fetchurl { - url = "http://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; + url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb"; }; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 7b42e8d60339..fbe44c6540b3 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sourceName = "higan_v${version}-source"; src = fetchurl { - urls = [ "http://download.byuu.org/${sourceName}.7z" ]; + urls = [ "https://download.byuu.org/${sourceName}.7z" ]; sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index c2103938accc..9a99c6ddb6f9 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.8"; src = fetchurl { - url = "http://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; + url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; sha256 = "1fdypk6gjkb4i2ghnbn3va50y69pdym51jx3iz9jns4636z4sfqd"; }; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 02cdcf7b4d1c..0c1446f0672f 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "xautolock-2.2"; src = fetchurl { - url = "http://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz"; + url = "https://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz"; sha256 = "11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2"; }; patches = [ diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix index c01fb7f15dd9..99ca221f5ba2 100644 --- a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtk-engine-bluecurve-1.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2"; + url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2"; sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; }; diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index ea4f44f52bbb..7b4ac9e1f3b8 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "atop-${version}"; src = fetchurl { - url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; + url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; sha256 = "0r5j9q89wpylmg0px5xymxi3jpihw9wq8bh37g3ciymsw1fp5r3k"; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 7e14983a6d2b..b7928e38fc98 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "audit-2.8.3"; src = fetchurl { - url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; }; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 90489e12d690..a3914067d7d8 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0"; }; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index a1a2cff70a83..61d0eb9bdb0c 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7"; }; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index e8972263f38d..1a8f7f768626 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { - url = "http://busybox.net/downloads/${name}.tar.bz2"; + url = "https://busybox.net/downloads/${name}.tar.bz2"; sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3"; }; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1ef18f703d3f..9b7f69d4ab89 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5"; src = fetchurl { - url = "http://www.trapkit.de/tools/checksec.sh"; + url = "https://www.trapkit.de/tools/checksec.sh"; sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p"; }; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 8f9983b5d6e3..755e88b46cbc 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.4.5"; src = fetchurl { - url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; }; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index dba495d0dee5..ad9b27f83fa9 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.9"; src = fetchurl { - url = "http://download.openvz.org/criu/${name}.tar.bz2"; + url = "https://download.openvz.org/criu/${name}.tar.bz2"; sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx"; }; diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index c2e950b4ba48..e71d36c5e485 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; src = fetchurl { - url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index b4c4af8c2e21..13614493f610 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { version = "17.11.2"; src = fetchurl { - url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; + url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2"; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 224239a4affd..8aa78e65dec1 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "b43-fwcutter-019"; src = fetchurl { - url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index e8ab77a509ff..bf8bcf387261 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "intel2200BGFirmware-${version}"; src = fetchurl { - url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; }; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fd37d35623e4..b7f47f12b15b 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fswebcam-20140113"; src = fetchurl { - url = "http://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; }; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index b6c77a930807..56e622df2ce8 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ioport-1.2"; src = fetchurl { - url = "http://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 1668933db809..0c088ac2a4bc 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchurl { - url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m"; }; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index c7915ace7ca3..201f170c2580 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.10"; src = fetchurl { - url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i"; }; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index a7b6561239d0..07ab0427b226 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "22-1.1"; src = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + url = "https://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh"; }; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index d3d6cfd4c58b..0fff816eac7b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { name = "kmscon-8"; src = fetchurl { - url = "http://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz"; sha256 = "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a"; }; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index c82c892c4627..14c152dc10e9 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libvolume_id-0.81.1"; src = fetchurl { - url = http://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; + url = https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 4f35d5465383..25b868369ae1 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" - "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" + "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" ]; sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 0e0178e8845b..a1b207ffea09 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz"; + url = "https://git.opensvc.com/"; sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; }; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 3d515f7b762f..6bcd2ea692d3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "1.1.19"; src = fetchurl { - url = "http://www.musl-libc.org/releases/musl-${version}.tar.gz"; + url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz"; sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; }; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 8bb42dff0945..468bfd135e77 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "nftables-${version}"; src = fetchurl { - url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index 69c6dd1510cb..a0464e1996a5 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "otpw-1.3"; src = fetchurl { - url = "http://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; }; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 76dbbf1e1be4..dd3957d36185 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pam-krb5-4.8"; src = fetchurl { - url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs"; }; diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index afb342768c33..270be695f03a 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9"; src = fetchurl { - url = "http://pax.grsecurity.net/${name}.tar.gz"; + url = "https://pax.grsecurity.net/${name}.tar.gz"; sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 4d70533fac7f..88592798a1f6 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz"; }; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 1053e07559e8..326ba444957e 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "pm-utils-1.4.1"; src = fetchurl { - url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index db494ec2493f..f24d8d1f875c 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "s6-linux-utils-${version}"; src = fetchurl { - url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; + url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip"; }; diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a61a54afc38e..a07eec431c33 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "smem-1.4"; src = fetchurl { - url = "http://www.selenic.com/smem/download/${name}.tar.gz"; + url = "https://www.selenic.com/smem/download/${name}.tar.gz"; sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f"; }; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index aeb9deac89d2..199523db4281 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "udisks-1.0.5"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 9bdb16cd1f16..fee9b0c09d56 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.14.2"; src = fetchurl { - url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6"; }; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 10ffa918e5bd..d9c7877978b2 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -26,7 +26,7 @@ let ''; src = fetchurl { - url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; + url = "https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b0fb29677f9a..ff99f7a7cbf6 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { - url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd"; }; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 5fe7a8608c59..d607389b78f2 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.6.7"; src = fetchurl { - url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243"; }; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1a5577e81655..e2db0b860f4c 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -15,7 +15,7 @@ unwrapped = stdenv.mkDerivation rec { version = "2.3.0"; src = fetchurl { - url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b"; }; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 63e4f3baa8f4..2c82b0bf33a8 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "nsd-4.1.22"; src = fetchurl { - url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; + url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi"; }; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index c34edfb5d6f8..6f8bffee24d0 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; src = fetchurl { - url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; + url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; sha256 = "1bh1qdgw415ax542123b6isri1jh4mbf2i9i1yffkfk0xmyv79cs"; }; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b01e94187898..911f3b23f0c1 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "gpsd-3.16"; src = fetchurl { - url = "http://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz"; + url = "https://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz"; sha256 = "0a90ph4qrlz5kkcz2mwkfk3cmwy9fmglp94znz2y0gsd7bqrlmq3"; }; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index a5dbf74947e2..fc9d4c0508ed 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4.193"; src = fetchzip { - url = "http://www.h2database.com/h2-2016-10-31.zip"; + url = "https://www.h2database.com/h2-2016-10-31.zip"; sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; }; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 5768e7badea0..58ae8f85b81f 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "tomcat-connectors-1.2.41-dev-1613051"; src = fetchurl { - url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; + url = "https://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 068053d71f09..c5702132d280 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 1e99aab24c60..473f2986ff06 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; version = "9.4.8.v20171121"; src = fetchurl { - url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; + url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh"; }; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 31b3449d5f64..4596dac09086 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "lighttpd-1.4.49"; src = fetchurl { - url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; + url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf"; }; diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index 02cf49854ac8..b636f79e6c60 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "micro-httpd-20140814"; src = fetchurl { - url = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; + url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk"; }; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 99b13dab84d0..37a0a98d4e01 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mini-httpd-1.7"; src = fetchurl { - url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; + url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49"; }; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index ff0a4c65b4a6..1466e7b2246a 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { name = "nginx-${version}"; src = fetchurl { - url = "http://nginx.org/download/nginx-${version}.tar.gz"; + url = "https://nginx.org/download/nginx-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 252e1a97dfdb..1155bac75703 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.13.6.2"; src = fetchurl { - url = "http://openresty.org/download/openresty-${version}.tar.gz"; + url = "https://openresty.org/download/openresty-${version}.tar.gz"; sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; }; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index b2c80b3f88fc..7d592d0256b7 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "redstore-0.5.4"; src = fetchurl { - url = "http://www.aelius.com/njh/redstore/${name}.tar.gz"; + url = "https://www.aelius.com/njh/redstore/${name}.tar.gz"; sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 8256bd9c734b..6e012c98737e 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.29"; src = fetchurl { - url = "http://acme.com/software/thttpd/${name}.tar.gz"; + url = "https://acme.com/software/thttpd/${name}.tar.gz"; sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r"; }; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index c9065d041618..55070a48b7d0 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; + url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8"; }; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index e98c58c891a1..a393df3d8bda 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5.1"; src = fetchurl { - url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; + url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73"; }; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 393ce2c5cda9..87d9e5042990 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "exim-4.91"; src = fetchurl { - url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; + url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc"; }; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index f17f3ed2de7e..ab632372b464 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "nullmailer-${version}"; src = fetchurl { - url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; + url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; }; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index a9ec36f59ca9..3d48e9527819 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -6,7 +6,7 @@ buildPerlPackage rec { version = "1.1.3"; src = fetchurl { - url = "http://jimsun.linxnet.com/downloads/${name}.tar.gz"; + url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz"; sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4"; }; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 1836d0e5cf36..3e7163cb1541 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -12,7 +12,7 @@ let name = "postgrey-${version}"; in runCommand name { src = fetchurl { - url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; + url = "https://postgrey.schweikert.ch/pub/${name}.tar.gz"; sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 8a4159a55213..44e1c65c7514 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "memcached-${version}"; src = fetchurl { - url = "http://memcached.org/files/${name}.tar.gz"; + url = "https://memcached.org/files/${name}.tar.gz"; sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k"; }; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index e9a9fcff2b93..dc6faf151b77 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0.132"; src = fetchurl { - url = "http://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz"; + url = "https://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz"; sha256 = "0cdvffdsadfahfn1779zjfawz6l77awab3g9mw43vsba1568jh4f"; }; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 4d0bb6c687db..9075756c1621 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { ++ 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"; + url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; }; diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index 8ea71d611ebb..a064049072c9 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { ++ 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"; + url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja"; }; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index 9998d34a2dae..e4c9b90ab145 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -7,7 +7,7 @@ let srcs = { riak = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; + url = "https://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; }; solr = fetchurl { diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a4b2418f58c9..d8c8682d504e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "8.0.2"; src = fetchurl { - url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; }; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a952dbada66f..0e31cd8fe08e 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "freeswitch-1.6.20"; src = fetchurl { - url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; + url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah"; }; postPatch = '' diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index e7114b957dcb..552f0fb4537c 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.0.5163"; src = fetchurl { - url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; + url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3"; }; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 6dcd19d8d680..a27f0ef0824c 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.6"; src = fetchurl { - url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68"; }; diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index 111b1be80f81..684817d309ba 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "psqlodbc-09.01.0200"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; }; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index bbb9b6ca5191..eb513d3aca62 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.19c"; src = fetchurl { - url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; + url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; sha256 = "1wvvqj9r293skgqi28q4ixz7zwf301h1bf514p41xbi7ifldy4dv"; }; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 0ccf4c5bd0be..87d0a0ee4553 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; src = fetchurl { - url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; + url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index bb3f79855330..bde6f78e130c 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { version = "2.0.17"; src = fetchurl { - url = "http://projects.unbit.it/downloads/${name}.tar.gz"; + url = "https://projects.unbit.it/downloads/${name}.tar.gz"; sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix"; }; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 85192b11c30f..68660ce6b36c 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -7,7 +7,7 @@ let name = "varnish-${version}"; src = fetchurl { - url = "http://varnish-cache.org/_downloads/${name}.tgz"; + url = "https://varnish-cache.org/_downloads/${name}.tgz"; inherit sha256; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e6f5e7ff5887..5e228ccba369 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1475,7 +1475,7 @@ let name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 40f630999450..ed6fef05a263 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "prosody-${version}"; src = fetchurl { - url = "http://prosody.im/downloads/source/${name}.tar.gz"; + url = "https://prosody.im/downloads/source/${name}.tar.gz"; sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm"; }; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 7c2caa96d898..a03aa338a83c 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" + "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; sha256 = "0xzv5b83b8ccn3d4qvwz3gk83fi1d42kphax1527nni1472fp1nx"; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 8bbe1b6a52b6..f33d03b6d15f 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -6,7 +6,7 @@ in buildPythonApplication rec { name = "arandr-0.1.9"; src = fetchurl { - url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; + url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"; }; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8ad1b6f6455e..14fe769db6be 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { name = "bumblebee-${version}"; src = fetchurl { - url = "http://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index ad51b6be51d7..21d7a50566db 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 31ad524cf8f3..2703379a23b9 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "x2vnc-1.7.2"; src = fetchurl { - url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 1c23593bd141..e633ba4f794a 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -4,7 +4,7 @@ let version = "1.8.6"; in stdenv.mkDerivation { name = "xbindkeys-${version}"; src = fetchurl { - url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; + url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; }; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e66b184c04cc..f4112765e675 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = http://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 3e0680cac449..c72fab015d9f 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xdg-user-dirs-0.17"; src = fetchurl { - url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz"; + url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz"; sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 279b2e8321a4..5ddc2432bd50 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { version = "2.3.1"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry"; }; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 7e620e0c2c81..a0c2ee8f995f 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { version = "2.2.5"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 11ab58bc62f8..363214129b28 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -21,7 +21,7 @@ let inherit version; src = fetchurl { - url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index c39c378d2216..b29d80e159b0 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libxcomp ]; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 2e9d8cafdc07..782e0f461ece 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cabextract-1.6"; src = fetchurl { - url = "http://www.cabextract.org.uk/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/${name}.tar.gz"; sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"; }; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 77536a7ad30e..68f7f02e7413 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; src = fetchurl { - url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 715efe719922..05d6a4718de9 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pxattr-2.1.0"; src = fetchurl { - url = "http://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 2505c012b26b..217a8ab35a9e 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 6d979bbf33d8..9e05043d4b02 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index edb67c13b9cd..2d54c182349c 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2018.06.23"; src = fetchzip { - url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; + url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; }; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 958afa3f6a9c..e9ae73547863 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.26.1"; src = fetchurl { - url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; + url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 91d12a568a49..3ab1eba5b6f0 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunksync-${version}"; src = fetchurl { - url = "http://chunksync.florz.de/chunksync_${version}.tar.gz"; + url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00"; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index ecd6a3209f4f..6d761354b6af 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "httrack-${version}"; src = fetchurl { - url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; + url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 095bd5f7d9a5..617d86e7f1e3 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "http://www.daemonology.net/bsdiff/${name}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${name}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 91f7637e1bcb..c9ec557ab1f4 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { version = "7.1"; src = fetchurl { - url = "http://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; + url = "https://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw"; }; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 72be1d28d248..00eb5f265aaf 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "lzop-1.04"; src = fetchurl { - url = "http://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/${name}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 732aa691d4a9..a2668f73ceb2 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { - url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index e720634ca44a..18bde25267d3 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index e5b09cbbff30..47428e7f52e4 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunkfs-${version}"; src = fetchurl { - url = "http://chunkfs.florz.de/chunkfs_${version}.tar.gz"; + url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; }; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b39c51a0c881..581970e34fa7 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "9"; src = fetchurl { - url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; + url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index ac1a7c1c1485..afe51caa8772 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 2f7e80dd912c..6acb034d75b6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.1.5.978"; src = fetchurl { - url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; sha256 = p.sha256; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 3283d6789f73..916b8509b0d0 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; src = fetchurl { - url = "http://frippery.org/uml/${name}.tgz"; + url = "https://frippery.org/uml/${name}.tgz"; sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index d35eae872040..7a06d9f346b8 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror - url = "http://www.argyllcms.com/Argyll_V${version}_src.zip"; + url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx"; # The argyllcms web server doesn't like curl ... diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 44ad267f9d4e..dd81c3e4ecc0 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dcraw-9.28.0"; src = fetchurl { - url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; + url = "https://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 47312f0f9975..9ce95154cb0b 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = http://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 424cf5c1bdc6..a7bb616d82b5 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "fgallery-1.8.2"; src = fetchurl { - url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 05ce6b6f7c9c..76cb3ab199c2 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.91"; src = fetchurl { - url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; + url = "https://www.lcdf.org/gifsicle/${name}.tar.gz"; sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha"; }; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 008f9af36852..6c62e0528386 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; src = fetchurl { - url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; + url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; }; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b5b394c5b6cb..b69a9ec81f69 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 693ca27a88d9..550ab4972d97 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "apparix-11-062"; src = fetchurl { - url = "http://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/${name}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index e02359eda803..c7829239c41f 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; src = fetchurl { - url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index a8b6d5f3c252..e8ea9117bc5a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${name}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 74894da54182..e34eea8b10ce 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.98"; src = fetchurl { - url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; + url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9"; }; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 793e5c56e1f1..90fc68dcc5cc 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,17 +3,17 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + name = "buildtorrent-${version}"; - src = fetchurl { - url = "http://mathr.co.uk/blog/code/${name}.tar.gz"; - sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; - }; + src = fetchurl { + url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; + }; - meta = { - description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - }; + meta = { + description = "A simple commandline torrent creator"; + homepage = http://mathr.co.uk/blog/torrent.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index c26f835c0ee5..38b4916e3942 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "colord-gtk-0.1.26"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9b6330140097..4461834cb74d 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "colord-1.4.2"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 253e6a50b361..52bcbde1cc1b 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "convmv-2.05"; src = fetchurl { - url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index bb1267d62f4b..747d7b26669b 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "dbacl-1.14"; src = fetchurl { - url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index e89222af74b4..a6280ff4008a 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "desktop-file-utils-0.23"; src = fetchurl { - url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 71b4ec338df3..f4354ad2416c 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ent-1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/random/random.zip"; + url = "https://www.fourmilab.ch/random/random.zip"; sha256 = "1v39jlj3lzr5f99avzs2j2z6anqqd64bzm1pdf6q84a5n8nxckn1"; }; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 1bdab1e841f8..21a126b04f3b 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "flashrom-${version}"; src = fetchurl { - url = "http://download.flashrom.org/releases/${name}.tar.bz2"; + url = "https://download.flashrom.org/releases/${name}.tar.bz2"; sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 9172c13636a6..d70af6b311ff 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; + url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; }; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index eb029d32f73e..be4de738c1c3 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; }; buildInputs = [ diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 32e796966c9f..9f489fee7ec6 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index e048a2800df5..12c199801c71 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "goaccess-${version}"; src = fetchurl { - url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; + url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb"; }; diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 405e19e75bf9..03af224b4c05 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.14"; src = fetchurl { - url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index c019803f9035..dc33d2ece548 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "logstash-contrib-${version}"; src = fetchzip { - url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; + url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k"; }; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 810bc36fb723..2e364e33fc68 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "memtest86-4.3.6"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; + url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; }; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 52f685b22ca6..18e7281ce83a 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "2017.6.6"; src = fetchurl { - url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 47eec54e127e..6913f1c11fdf 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = - "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 556d21ee2fc7..850ed32998b4 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "29.4b7"; src = fetchurl { - url = "http://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; + url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m"; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 82155eb51c7f..39c9323151f3 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "multitail-${version}"; src = fetchurl { - url = "http://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${name}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 330210269d57..b167d0f2c475 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.13"; src = fetchurl { - url = "http://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${name}.tar.gz"; sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; }; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index cd1e5457639b..f453199835f5 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pv-1.6.6"; src = fetchurl { - url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; + url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; }; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index dfda07fda4e4..8dcc9ef81ff6 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -9,7 +9,7 @@ assert tkremind -> makeWrapper != null; stdenv.mkDerivation rec { name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 66ddd0548a8c..b5b5a2cfed8f 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; src = fetchurl { - url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; + url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index ed97601e5191..650ac9f660aa 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2"; src = fetchurl { - url = "http://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 671dba0d548b..4d826c97d29c 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "rrdtool-1.7.0"; src = fetchurl { - url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; }; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index a9fefe446fe0..668a3fd5c996 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.2.1.1"; src = fetchurl { - url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; + url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; }; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index a256b8e4fdb3..03926b955383 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "t1utils-1.41"; src = fetchurl { - url = "http://www.lcdf.org/type/${name}.tar.gz"; + url = "https://www.lcdf.org/type/${name}.tar.gz"; sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 80cbf3661da8..14c152236d6b 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "testdisk-7.1"; src = fetchurl { - url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2; + url = https://www.cgsecurity.org/testdisk-7.0.tar.bz2; sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; }; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 84546985f72e..978a3d541ab0 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index fc8c40ea4e06..2a792669ba8b 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y"; }; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 1c108af27f88..90b721ad58ae 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vorbisgain-0.37"; src = fetchurl { - url = "http://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 63b6cb66883b..dd3cbb33c1b1 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.43"; src = fetchurl { - url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index e3a5a58671c9..6d99a5c2d1a5 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aircrack-ng-1.2"; src = fetchurl { - url = "http://download.aircrack-ng.org/${name}.tar.gz"; + url = "https://download.aircrack-ng.org/${name}.tar.gz"; sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; }; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 128ebc155b56..a06b409ca49b 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bwm-ng-${version}"; src = fetchurl { - url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 1299c5eea5f3..27f5ca2c7dd1 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.3"; src = fetchurl { - url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; + url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; }; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 1ebf57997d00..6c7f335891f5 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "4.4.1"; src = fetchurl { - url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 2599e822529f..d557c0ab9adb 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj"; - url = "http://www.mavetju.org/download/dhcping-${version}.tar.gz"; + url = "https://www.mavetju.org/download/dhcping-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 65e5c9cd126b..5e2b27c6516c 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "dnstracer-${version}"; src = fetchurl { - url = "http://www.mavetju.org/download/${name}.tar.gz"; + url = "https://www.mavetju.org/download/${name}.tar.gz"; sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; }; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b7ef3b8fa75b..be2e43a8947a 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dropbear-2018.76"; src = fetchurl { - url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; }; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index b76b32ec4c8a..2b19c8e6a057 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fping-4.0"; src = fetchurl { - url = "http://www.fping.org/dist/${name}.tar.gz"; + url = "https://www.fping.org/dist/${name}.tar.gz"; sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7"; }; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 312906f95100..d8d4353f7820 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = http://www.gftp.org/gftp-2.0.19.tar.bz2; + url = https://www.gftp.org/gftp-2.0.19.tar.bz2; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 2317a4e2216c..07676cb18712 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"; }; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 69f27ff37c23..5aa0c01e8485 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iodine-0.7.0"; src = fetchurl { - url = "http://code.kryo.se/iodine/${name}.tar.gz"; + url = "https://code.kryo.se/iodine/${name}.tar.gz"; sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"; }; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 0506c8580296..00a3f7f3b6b0 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; - url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index ece7ea3c95e2..ed6ca57f3da8 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iperf-3.5"; src = fetchurl { - url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; + url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; }; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 36eced808569..86d162648238 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { urls = [ "https://lftp.tech/ftp/${name}.tar.xz" "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" - "http://lftp.yar.ru/ftp/${name}.tar.xz" + "https://lftp.yar.ru/ftp/${name}.tar.xz" ]; sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"; }; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index a1a2b79b86a4..babfcf1db216 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ judy ]; src = fetchurl { - url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; + url = "https://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"; }; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9af9dc980e7..8612808687e8 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.7.990"; src = fetchurl { - url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; }; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 56cdbd178250..619cdac92668 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ndisc6-1.0.3"; src = fetchurl { - url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index d84f87ed1ba7..de53cfdd224c 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { urls = [ "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz" - "http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" ]; sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index bd5190767d1f..d10125e09a65 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" + "https://mamuti.net/files/netrw/netrw-${version}.tar.bz2" "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" ]; sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 3e4d2d6e9207..c63d7ac057b1 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "noip-2.1.9-1"; src = fetchurl { - url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 1178f5f0107e..6e566d3c4739 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "ntp-4.2.8p11"; src = fetchurl { - url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; + url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 4775d42d7a9e..bc026d6835b8 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 4651dab7e67e..b2584a4f4974 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -5,7 +5,7 @@ in stdenv.mkDerivation rec { name = "rp-pppoe-" + version; src = fetchurl { - url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; + url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; }; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 2172efc63e35..cca6d630fc13 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "smokeping-${version}"; version = "2.6.11"; src = fetchurl { - url = "http://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; + url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index b50d619b437d..ad2d88e4a982 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; src = fetchurl { - url = "http://www.tarsnap.com/spiped/${name}.tgz"; + url = "https://www.tarsnap.com/spiped/${name}.tgz"; sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 9ceb08ad72e9..74405a472f8a 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "5.6.3"; src = fetchurl { - url = "http://download.strongswan.org/${name}.tar.bz2"; + url = "https://download.strongswan.org/${name}.tar.bz2"; sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3"; }; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 1b121335ac7a..be807e307715 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20170101.0"; src = fetchurl { - url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4"; }; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 9ef5ff2a4f08..bf039b653cc6 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; src = fetchurl { - url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; + url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; }; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 52bb418fc0d0..f6c88bb66b7c 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "trickle-1.07"; src = fetchurl { - url = "http://monkey.org/~marius/trickle/${name}.tar.gz"; + url = "https://monkey.org/~marius/trickle/${name}.tar.gz"; sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index fc46c6a15bc5..8a3b292ad81f 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ucspi-tcp-0.88"; src = fetchurl { - url = "http://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 440f91a6d64c..677dbda7b495 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.6"; name = "opkg-${version}"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn"; }; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 52bc59abb4cb..287fc3e899c0 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.8.0"; src = fetchurl { - url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; + url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; }; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index e9929cb2e6fc..c095b77129cc 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5"; src = fetchurl { - url = "http://www.vanheusden.com/gpgstats/${name}.tgz"; + url = "https://www.vanheusden.com/gpgstats/${name}.tgz"; sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; }; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index fb078674ea74..84b738a21092 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6"; src = fetchurl { - url = "http://www.vanheusden.com/nasty/${name}.tgz"; + url = "https://www.vanheusden.com/nasty/${name}.tgz"; sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn"; }; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 37efbd80fbbe..c7e9267dde71 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -33,7 +33,7 @@ let name = "password-store-${version}"; src = fetchurl { - url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; }; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 866e1f41028b..688521e1401a 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; + url = "https://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; }; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index b64124b3c54d..086c82faa4c7 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { name = "volatility-${version}"; src = fetchurl { - url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; + url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; }; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bb9fa2dd877c..39f6f17debff 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { name = "collectd-${version}"; src = fetchurl { - url = "http://collectd.org/files/${name}.tar.bz2"; + url = "https://collectd.org/files/${name}.tar.bz2"; sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; }; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 80d6f6a42f81..4b6ead9667d0 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dfc-3.0.5"; src = fetchurl { - url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; + url = "https://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w"; }; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 57e3e63ca896..5a6b1c22288c 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.3-4"; src = fetchurl { - url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 974a95bc0fab..68c6ef3c3ef5 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index 34a48bd30539..d7c1f89a7862 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchurl { - url = "http://www.vanheusden.com/iops/${name}.tgz"; + url = "https://www.vanheusden.com/iops/${name}.tgz"; sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; }; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index f6e09b6816f6..d57b65189753 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "B.${numVersion}"; src = fetchurl { - url = "http://ezix.org/software/files/lshw-${version}.tar.gz"; + url = "https://ezix.org/software/files/lshw-${version}.tar.gz"; sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; }; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 4525343dcc14..234aacbbfdee 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; src = fetchurl { - url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r"; }; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index ef98341c5bac..81e929382b2d 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "rsyslog-8.21.0"; src = fetchurl { - url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; + url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; }; diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 5a4734328ff9..1595e8347e15 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "stress-1.0.4"; src = fetchurl { - url = "http://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; + url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz"; sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5"; }; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index a8c27a42b1dd..c30a7b14e891 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd"; }; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index c46f96241551..46fdf29ad46c 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.colordiff.org/${name}.tar.gz" + "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index dea8e15b540a..7404c887a46b 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.04"; src = fetchurl { - url = "http://www.jwz.org/dadadodo/${name}.tar.gz"; + url = "https://www.jwz.org/dadadodo/${name}.tar.gz"; sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if"; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index f1899b42b866..098eee7cf720 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.19"; src = fetchurl { - url = "http://dl.cihar.com/enca/${name}.tar.xz"; + url = "https://dl.cihar.com/enca/${name}.tar.xz"; sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s"; }; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 2f09c4dfbe31..8f998e3a26d2 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qprint-1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 9eebb830db1c..ccf17695f6cd 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "uni2ascii-4.18"; src = fetchurl { - url = "http://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f681ae62aeaa..8851b8a2725c 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.7"; src = fetchurl { - url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; + url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index edb3d6add169..674673f260ce 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; + url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip"; sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; From 6eb81b805b8050924ce4c2b3d7e933dc5891a186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 28 Jun 2018 19:59:07 +0100 Subject: [PATCH 281/312] lxd: also needs ebtables --- pkgs/tools/admin/lxd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index cfbb90fdc308..dfe4c099bebb 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, squashfsTools, iproute, iptables, ebtables }: buildGoPackage rec { @@ -26,7 +27,7 @@ buildGoPackage rec { rm $bin/bin/{deps,macaroon-identity} wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables ]} ''; From 337b58950b9f945933eb82b46c9c4ceb1af3f997 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 11:12:39 -0400 Subject: [PATCH 282/312] generators: refactor toPlist Address PR comments Refactors - Rename toPLIST -> toPlist --- lib/generators.nix | 65 ++++++++++---------- pkgs/development/tools/xcbuild/platform.nix | 12 ++-- pkgs/development/tools/xcbuild/sdk.nix | 6 +- pkgs/development/tools/xcbuild/toolchain.nix | 4 +- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 143329815837..073bb6982e14 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -173,54 +173,53 @@ rec { fna); in if fna == {} then "<λ>" else "<λ:{${showFnas}}>" - else abort "toPretty: should never happen (v = ${v})"; + else abort "generators.toPretty: should never happen (v = ${v})"; # PLIST handling - toPLIST = {}: v: let - pprExpr = ind: x: with builtins; + toPlist = {}: v: let + expr = ind: x: with builtins; if isNull x then "" else - if isBool x then pprBool ind x else - if isInt x then pprInt ind x else - if isString x then pprStr ind x else - if isList x then pprList ind x else - if isAttrs x then pprAttrs ind x else - abort "pprExpr: should never happen (v = ${v})"; + if isBool x then bool ind x else + if isInt x then int ind x else + if isString x then str ind x else + if isList x then list ind x else + if isAttrs x then attrs ind x else + abort "generators.toPlist: should never happen (v = ${v})"; - pprLiteral = ind: x: ind + x; + literal = ind: x: ind + x; - pprBool = ind: x: pprLiteral ind (if x then "" else ""); - pprInt = ind: x: pprLiteral ind "${toString x}"; - pprStr = ind: x: pprLiteral ind "${x}"; - pprKey = ind: x: pprLiteral ind "${x}"; + bool = ind: x: literal ind (if x then "" else ""); + int = ind: x: literal ind "${toString x}"; + str = ind: x: literal ind "${x}"; + key = ind: x: literal ind "${x}"; - pprIndent = ind: pprExpr "\t${ind}"; + indent = ind: expr "\t${ind}"; - pprItem = ind: libStr.concatMapStringsSep "\n" (pprIndent ind); + item = ind: libStr.concatMapStringsSep "\n" (indent ind); - pprList = ind: x: libStr.concatStringsSep "\n" [ - (pprLiteral ind "") - (pprItem ind x) - (pprLiteral ind "") + list = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (item ind x) + (literal ind "") ]; - pprAttrs = ind: x: libStr.concatStringsSep "\n" [ - (pprLiteral ind "") - (pprAttr ind x) - (pprLiteral ind "") + attrs = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (attr ind x) + (literal ind "") ]; - pprAttr = let attrFilter = name: value: name != "_module" && value != null; + attr = let attrFilter = name: value: name != "_module" && value != null; in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList (name: value: lib.optional (attrFilter name value) [ - (pprKey "\t${ind}" name) - (pprExpr "\t${ind}" value) + (key "\t${ind}" name) + (expr "\t${ind}" value) ]) x)); - in '' - - - - ${pprExpr "" v} - ''; + in '' + + +${expr "" v} +''; } diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 502c3bcdbc87..bb91df474aae 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -2,7 +2,7 @@ let - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; Info = { CFBundleIdentifier = platformName; @@ -286,11 +286,11 @@ let in runCommand "MacOSX.platform" {} '' - install -D ${writeText "Info.plist" (toPLIST {} Info)} $out/Info.plist - install -D ${writeText "version.plist" (toPLIST {} Version)} $out/version.plist - install -D ${writeText "Architectures.xcspec" (toPLIST {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec - install -D ${writeText "PackageTypes.xcspec" (toPLIST {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec - install -D ${writeText "ProductTypes.xcspec" (toPLIST {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec + install -D ${writeText "Info.plist" (toPlist {} Info)} $out/Info.plist + install -D ${writeText "version.plist" (toPlist {} Version)} $out/version.plist + install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec + install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec + install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec 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 5fdfe5877228..c97d17d739ba 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,7 +1,7 @@ { runCommand, lib, toolchainName, sdkName, writeText }: let - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. version = "10.10"; @@ -24,6 +24,6 @@ in runCommand "MacOSX${version}.sdk" { inherit version; } '' - install -D ${writeText "SDKSettings.plist" (toPLIST {} SDKSettings)} $out/SDKSettings.plist - install -D ${writeText "SystemVersion.plist" (toPLIST {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist + install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $out/SDKSettings.plist + install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist '' diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index ed5730abddf6..51bc5d60bcfe 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -4,7 +4,7 @@ let inherit (lib) getBin optionalString; - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; ToolchainInfo = { Identifier = toolchainName; @@ -24,7 +24,7 @@ runCommand "nixpkgs.xctoolchain" { nativeBuildInputs = [ makeWrapper ]; } ('' mkdir -p $out - install -D ${writeText "ToolchainInfo.plist" (toPLIST {} ToolchainInfo)} $out/ToolchainInfo.plist + install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $out/ToolchainInfo.plist mkdir -p $out/usr/include mkdir -p $out/usr/lib From 9fcc63abb566e8d7c0e86c427a740553d329f00f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 16:01:29 -0400 Subject: [PATCH 283/312] libcCross: Use correct libSystem --- 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 015ad74a9348..5dd69afc5236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9286,7 +9286,7 @@ with pkgs; else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries - else if name == "libSystem" then darwin.xcode + else if name == "libSystem" then targetPackages.darwin.xcode else throw "Unknown libc"; libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc; From c876db629d2c05acb8adcf80feabc6d8758842f5 Mon Sep 17 00:00:00 2001 From: Anton Latukha Date: Thu, 28 Jun 2018 23:25:19 +0300 Subject: [PATCH 284/312] mbedtls: cmake&ninja, threading, clean-up; hiawatha: options, Nix mbedtls (#41722) * mbedtls: build with cmake&ninja, clean-up * mbedtls: cmake ninja Darwin build clean-up * hiawatha: add build options, use system mbedTLS, platforms -> unix --- .../development/libraries/mbedtls/default.nix | 55 ++++++------------- pkgs/servers/http/hiawatha/default.nix | 41 +++++++------- 2 files changed, 39 insertions(+), 57 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 152d7bdc37b3..a1a096b096d7 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,7 +1,16 @@ -{ stdenv, fetchFromGitHub, perl }: +{ stdenv +, fetchFromGitHub + +, cmake +, ninja +, perl # Project uses Perl for scripting and testing + +, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading +}: stdenv.mkDerivation rec { - name = "mbedtls-2.11.0"; + name = "mbedtls-${version}"; + version = "2.11.0"; src = fetchFromGitHub { owner = "ARMmbed"; @@ -10,47 +19,19 @@ stdenv.mkDerivation rec { sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ cmake ninja perl ]; - postPatch = '' - patchShebangs . - '' + 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 + postConfigure = stdenv.lib.optionals enableThreading '' + perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer + perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; - makeFlags = [ - "SHARED=1" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "DLEXT=dylib" - ]; - - installFlags = [ - "DESTDIR=\${out}" - ]; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - - for exe in $out/bin/*; do - if [[ $exe != *.sh ]]; then - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - fi - done - ''; - - doCheck = true; + cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; meta = with stdenv.lib; { homepage = https://tls.mbed.org/; - description = "Portable cryptographic and SSL/TLS library, aka polarssl"; - license = licenses.gpl3; + description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; + license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ wkennington fpletz ]; }; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 39722c6d831f..e10799e27f8a 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -3,16 +3,16 @@ , cmake , ninja +, mbedtls -, libxslt -, libxml2 - -, enableSSL ? true -, enableMonitor ? false -, enableRproxy ? true -, enableTomahawk ? false -, enableXSLT ? true -, enableToolkit ? true +, enableCache ? true # Internal cache support. +, enableIpV6 ? true +, enableTls ? true +, enableMonitor ? false # Support for the Hiawatha Monitor. +, enableRproxy ? true # Reverse proxy support. +, enableTomahawk ? false # Tomahawk, the Hiawatha command shell. +, enableXslt ? true, libxml2 ? null, libxslt ? null +, enableToolkit ? true # The URL Toolkit. }: stdenv.mkDerivation rec { @@ -27,28 +27,29 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ libxslt libxml2 ]; + buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" ''; cmakeFlags = [ - ( - # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks: - # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled." - if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) - ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) - ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) - ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) - ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) - ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) + "-DUSE_SYSTEM_MBEDTLS=on" # Policy to use Nix deps, and Nix uses up to date deps + ( if enableCache then "-DENABLE_CACHE=on" else "-DENABLE_CACHE=off" ) + ( if enableIpV6 then "-DENABLE_IPV6=on" else "-DENABLE_IPV6=off" ) + ( if enableTls then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) + ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) + ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) + ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) + ( if enableXslt then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) + ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) ]; meta = with stdenv.lib; { + homepage = https://www.hiawatha-webserver.org; description = "An advanced and secure webserver"; license = licenses.gpl2; - homepage = https://www.hiawatha-webserver.org; + platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" maintainers = [ maintainers.ndowens ]; }; From 23aeb0d8ed2403c529118aef3b2f852ecc8364ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 28 Jun 2018 22:07:56 +0100 Subject: [PATCH 285/312] nix-review: 0.2.0 -> 0.3.0 --- pkgs/tools/package-management/nix-review/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 14b234c4dd5a..c216195f54d7 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -2,24 +2,27 @@ , python3 , fetchFromGitHub , nix +, git , makeWrapper }: python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "138f9m2c8fwpvn3kv5q7845ffi1pjbqxcs44aych4832i0pn6jaf"; + sha256 = "0dv6hzmfqyhfi6zzjm10nzzqiy2wyfhiksm1cd4fznq0psxaihfj"; }; buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram $out/bin/nix-review --prefix PATH : ${nix}/bin + wrapProgram $out/bin/nix-review --prefix PATH : ${stdenv.lib.makeBinPath [ + git nix + ]} ''; meta = with stdenv.lib; { From 0068fea88cf6d9e1efe031753f9e48a424967ef8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 28 Jun 2018 23:26:44 +0200 Subject: [PATCH 286/312] nodePackages: regenerate with node2nix 1.6.0 --- .../node-packages/composition-v6.nix | 2 +- .../node-packages/composition-v8.nix | 2 +- pkgs/development/node-packages/default-v6.nix | 52 +- pkgs/development/node-packages/default-v8.nix | 52 +- pkgs/development/node-packages/node-env.nix | 81 +- .../node-packages/node-packages-v6.nix | 10165 +++++++++------- .../node-packages/node-packages-v8.nix | 1620 ++- .../web/remarkjs/node-packages.nix | 1069 +- pkgs/development/web/remarkjs/nodepkgs.nix | 2 +- .../node-packages-generated.nix | 2243 ++-- pkgs/misc/base16-builder/node-packages.nix | 9 +- .../networking/airfield/node-packages.nix | 183 +- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/package-management/nixui/nixui.nix | 2 +- .../nixui/node-packages.nix | 18 +- 15 files changed, 8150 insertions(+), 7352 deletions(-) diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 2252bab3a793..ce42bfa7ba3d 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 96266105942d..7ca3e6b925a2 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 97f759ef0cbe..6b508b6f0cce 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,27 +6,27 @@ let }; in nodePackages // { - dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; - }); + dat = nodePackages.dat.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; - dnschain = nodePackages.dnschain.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + dnschain = nodePackages.dnschain.override { + buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin ''; - }); + }; - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + webdrvr = nodePackages.webdrvr.override { + buildInputs = [ pkgs.phantomjs ]; preRebuild = '' mkdir $TMPDIR/webdrvr @@ -42,42 +42,42 @@ nodePackages // { ''; dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); + }; npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { postInstall = "npm run-script prepublish"; }; - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + bower2nix = nodePackages.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; - }); + }; - ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + ios-deploy = nodePackages.ios-deploy.override { preRebuild = '' LD=$CC tmp=$(mktemp -d) ln -s /usr/bin/xcodebuild $tmp export PATH="$PATH:$tmp" ''; - }); + }; - fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js ''; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + buildInputs = [ pkgs.phantomjs2 ]; + }; - node2nix = nodePackages.node2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} ''; - }); + }; } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index eb87f13f56d3..561f43271ffc 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -6,27 +6,27 @@ let }; in nodePackages // { - dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; - }); + dat = nodePackages.dat.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; - dnschain = nodePackages.dnschain.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + dnschain = nodePackages.dnschain.override { + buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin ''; - }); + }; - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + webdrvr = nodePackages.webdrvr.override { + buildInputs = [ pkgs.phantomjs ]; preRebuild = '' mkdir $TMPDIR/webdrvr @@ -42,32 +42,32 @@ nodePackages // { ''; dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); + }; npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { postInstall = "npm run-script prepublish"; }; - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + bower2nix = nodePackages.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; - }); + }; - ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + ios-deploy = nodePackages.ios-deploy.override { preRebuild = '' LD=$CC tmp=$(mktemp -d) ln -s /usr/bin/xcodebuild $tmp export PATH="$PATH:$tmp" ''; - }); + }; - pnpm = nodePackages.pnpm.override (oldAttrs: { - nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + pnpm = nodePackages.pnpm.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = let pnpmLibPath = stdenv.lib.makeBinPath [ nodejs.passthru.python @@ -78,13 +78,13 @@ nodePackages // { wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} done ''; - }); + }; - fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js ''; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + buildInputs = [ pkgs.phantomjs2 ]; + }; } diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index fc118a788ea7..720e0cc08503 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -27,7 +27,7 @@ let buildInputs = [ nodejs ]; buildPhase = '' export HOME=$TMPDIR - tgzFile=$(npm pack) + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) ''; installPhase = '' mkdir -p $out/tarballs @@ -309,31 +309,42 @@ let }; # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in - stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { + stdenv.mkDerivation ({ name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; - dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments + ++ buildInputs; - inherit dontNpmInstall preRebuild; - - unpackPhase = args.unpackPhase or "true"; - - buildPhase = args.buildPhase or "true"; + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = args.installPhase or '' + installPhase = '' # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -406,27 +417,47 @@ let # Run post install hook, if provided runHook postInstall ''; - }); + } // extraArgs); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - nodeDependencies = stdenv.mkDerivation { + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - buildCommand = '' + installPhase = '' mkdir -p $out/${packageName} cd $out/${packageName} @@ -438,13 +469,15 @@ let ${stdenv.lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then - cp ${src}/package-lock.json . + cp ${src}/package-lock.json . fi ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + source $pinpointDependenciesScriptPath cd ${packageName} @@ -474,15 +507,17 @@ let ''} cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; - }; + } // extraArgs); in - stdenv.lib.makeOverridable stdenv.mkDerivation { + stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < { inherit system; diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 6ec938cfdefb..52f3446e8c41 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,79 +1,16 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "ejs-2.5.7" = { - name = "ejs"; - packageName = "ejs"; - version = "2.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; - sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; - }; - }; - "fs-promise-0.3.1" = { - name = "fs-promise"; - packageName = "fs-promise"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; - sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; - }; - }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; - }; - }; - "limax-1.5.0" = { - name = "limax"; - packageName = "limax"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/limax/-/limax-1.5.0.tgz"; - sha1 = "bbe7f2d3231cef709ebef8c32e3c75bce8fa5734"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "open-0.0.5" = { - name = "open"; - packageName = "open"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; - sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; - }; - }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "ansi-styles-2.2.1" = { @@ -85,51 +22,6 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; "any-promise-0.1.0" = { name = "any-promise"; packageName = "any-promise"; @@ -139,220 +31,13 @@ let sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27"; }; }; - "argparse-1.0.9" = { + "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; - "esprima-4.0.0" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - }; - "hepburn-1.0.0" = { - name = "hepburn"; - packageName = "hepburn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; - sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; - }; - }; - "pinyin-2.8.3" = { - name = "pinyin"; - packageName = "pinyin"; - version = "2.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; - sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; - }; - }; - "speakingurl-13.0.0" = { - name = "speakingurl"; - packageName = "speakingurl"; - version = "13.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/speakingurl/-/speakingurl-13.0.0.tgz"; - sha1 = "266c52d2b47585375af058e4783c8d1097a2d3db"; - }; - }; - "bulk-replace-0.0.1" = { - name = "bulk-replace"; - packageName = "bulk-replace"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; - sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; - }; - }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "nodejieba-2.2.5" = { - name = "nodejieba"; - packageName = "nodejieba"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.5.tgz"; - sha1 = "821441a683fad25ebd2c8dde1401dd43dbeb027a"; - }; - }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - 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.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "array-find-index-1.0.2" = { @@ -364,40 +49,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; "builtin-modules-1.1.1" = { @@ -409,283 +67,49 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; + "bulk-replace-0.0.1" = { + name = "bulk-replace"; + packageName = "bulk-replace"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; + sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; }; }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - 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"; - }; - }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; - }; - }; - "is-npm-1.0.0" = { - name = "is-npm"; - packageName = "is-npm"; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; - "semver-diff-2.1.0" = { - name = "semver-diff"; - packageName = "semver-diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; - }; - }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; "code-point-at-1.1.0" = { @@ -697,157 +121,31 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; + "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/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; - }; - }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; - }; - }; - "registry-url-3.1.0" = { - name = "registry-url"; - packageName = "registry-url"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; "create-error-class-3.0.2" = { @@ -859,6 +157,42 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; "duplexer2-0.1.4" = { name = "duplexer2"; packageName = "duplexer2"; @@ -868,6 +202,213 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; + "ejs-2.6.1" = { + name = "ejs"; + packageName = "ejs"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz"; + sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "fs-promise-0.3.1" = { + name = "fs-promise"; + packageName = "fs-promise"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; + sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; + }; + }; + "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"; + }; + }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "hepburn-1.0.0" = { + name = "hepburn"; + packageName = "hepburn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; + sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + }; + }; + "hosted-git-info-2.6.1" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; + sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "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"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "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"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -895,94 +436,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; - "read-all-stream-3.1.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; - "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"; - }; - }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; - }; - }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; - }; - }; - "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"; + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; "isarray-1.0.0" = { @@ -994,40 +454,274 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; + "limax-1.6.0" = { + name = "limax"; + packageName = "limax"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz"; + sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "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"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "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"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "nodejieba-2.2.6" = { + name = "nodejieba"; + packageName = "nodejieba"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz"; + sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3"; + }; + }; + "normalize-package-data-2.4.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + }; + }; + "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"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pinyin-2.8.3" = { + name = "pinyin"; + packageName = "pinyin"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; + sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; }; }; "prepend-http-1.0.4" = { @@ -1039,31 +733,238 @@ let sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; }; }; - "rc-1.2.1" = { + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + }; + }; + "rc-1.2.8" = { name = "rc"; packageName = "rc"; - version = "1.2.1"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; - sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + }; + }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "spdx-correct-3.0.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; + sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + }; + }; + "spdx-exceptions-2.1.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; + sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.0" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; + sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + }; + }; + "speakingurl-14.0.1" = { + name = "speakingurl"; + packageName = "speakingurl"; + version = "14.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz"; + sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; "strip-json-comments-2.0.1" = { @@ -1075,6 +976,114 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "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"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "validate-npm-package-license-3.0.3" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; + sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "xdg-basedir-2.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; + sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + }; + }; }; in { @@ -1087,344 +1096,129 @@ in sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f"; }; dependencies = [ - (sources."chalk-1.1.3" // { + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."any-promise-0.1.0" + sources."argparse-1.0.10" + sources."array-find-index-1.0.2" + sources."boxen-0.3.1" + sources."builtin-modules-1.1.1" + sources."bulk-replace-0.0.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.0" + sources."chalk-1.1.3" + sources."code-point-at-1.1.0" + sources."commander-1.1.1" + sources."configstore-2.1.0" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."currently-unhandled-0.4.1" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."ejs-2.6.1" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" + sources."fs-promise-0.3.1" + sources."get-stdin-4.0.1" + sources."got-5.7.1" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."hepburn-1.0.0" + sources."hosted-git-info-2.6.1" + sources."imurmurhash-0.1.4" + sources."indent-string-2.1.0" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."js-yaml-3.12.0" + sources."keypress-0.1.0" + sources."latest-version-2.0.0" + sources."limax-1.6.0" + sources."load-json-file-1.1.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."ejs-2.5.7" - (sources."fs-promise-0.3.1" // { - dependencies = [ - sources."any-promise-0.1.0" - ]; - }) - (sources."js-yaml-3.10.0" // { - dependencies = [ - (sources."argparse-1.0.9" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) - sources."esprima-4.0.0" - ]; - }) - (sources."limax-1.5.0" // { - dependencies = [ - (sources."hepburn-1.0.0" // { - dependencies = [ - sources."bulk-replace-0.0.1" - ]; - }) - (sources."pinyin-2.8.3" // { - dependencies = [ - (sources."commander-1.1.1" // { - dependencies = [ - sources."keypress-0.1.0" - ]; - }) - sources."object-assign-4.1.1" - (sources."nodejieba-2.2.5" // { - dependencies = [ - sources."nan-2.3.5" - ]; - }) - ]; - }) - sources."speakingurl-13.0.0" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - (sources."normalize-package-data-2.4.0" // { - dependencies = [ - sources."hosted-git-info-2.5.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.4.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."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - 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."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" + sources."minimist-0.0.8" ]; }) + sources."nan-2.10.0" + sources."node-status-codes-1.0.0" + sources."nodejieba-2.2.6" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" sources."open-0.0.5" - (sources."update-notifier-0.6.3" // { - dependencies = [ - (sources."boxen-0.3.1" // { - dependencies = [ - sources."filled-array-1.1.0" - sources."object-assign-4.1.1" - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."widest-line-1.0.0" - ]; - }) - (sources."configstore-2.1.0" // { - dependencies = [ - (sources."dot-prop-3.0.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - sources."uuid-2.0.3" - (sources."write-file-atomic-1.3.4" // { - dependencies = [ - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - ]; - }) - (sources."xdg-basedir-2.0.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - sources."is-npm-1.0.0" - (sources."latest-version-2.0.0" // { - dependencies = [ - (sources."package-json-2.4.0" // { - dependencies = [ - (sources."got-5.7.1" // { - dependencies = [ - (sources."create-error-class-3.0.2" // { - dependencies = [ - sources."capture-stack-trace-1.0.0" - ]; - }) - sources."duplexer2-0.1.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."object-assign-4.1.1" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - sources."read-all-stream-3.1.0" - (sources."readable-stream-2.3.3" // { - 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."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" - (sources."url-parse-lax-1.0.0" // { - dependencies = [ - sources."prepend-http-1.0.4" - ]; - }) - ]; - }) - (sources."registry-auth-token-3.3.1" // { - dependencies = [ - (sources."rc-1.2.1" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."safe-buffer-5.1.1" - ]; - }) - (sources."registry-url-3.1.0" // { - dependencies = [ - (sources."rc-1.2.1" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - ]; - }) - sources."semver-5.4.1" - ]; - }) - ]; - }) - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.4.1" - ]; - }) - ]; - }) + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."package-json-2.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pinyin-2.8.3" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."rc-1.2.8" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeating-2.0.1" + sources."safe-buffer-5.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."speakingurl-14.0.1" + sources."sprintf-js-1.0.3" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."timed-out-3.1.3" + sources."trim-newlines-1.0.0" + sources."unzip-response-1.0.2" + sources."update-notifier-0.6.3" + sources."url-parse-lax-1.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-2.0.3" + sources."validate-npm-package-license-3.0.3" + sources."widest-line-1.0.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -1433,5 +1227,6 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index a112dcdec975..8e6e01237eae 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -1,16 +1,17 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let - nodeEnv = import ./../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile; + nodeEnv = import ../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index 657d9284f1b8..13edd48e37d2 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -49,13 +49,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; }; }; "bcrypt-pbkdf-1.0.1" = { @@ -67,24 +67,6 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; "buffer-crc32-0.1.1" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -184,15 +166,6 @@ let sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -208,7 +181,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "delayed-stream-1.0.0" = { @@ -337,24 +310,6 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "hoek-4.2.1" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -427,13 +382,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.5" = { + "lodash-4.17.10" = { name = "lodash"; packageName = "lodash"; - version = "4.17.5"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; }; }; "methods-0.0.1" = { @@ -460,7 +415,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; "mime-types-2.1.18" = { @@ -469,7 +424,7 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; "mkdirp-0.3.3" = { @@ -535,13 +490,13 @@ let sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }; }; - "qs-6.5.1" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-0.0.4" = { @@ -559,7 +514,7 @@ let version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; "redis-commands-1.3.5" = { @@ -568,7 +523,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; + sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; }; }; "redis-parser-2.6.0" = { @@ -580,13 +535,22 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "send-0.1.0" = { @@ -598,31 +562,13 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "tough-cookie-2.3.4" = { @@ -631,7 +577,7 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; }; }; "tunnel-agent-0.6.0" = { @@ -652,22 +598,22 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.2.1" = { + "uuid-3.3.0" = { name = "uuid"; packageName = "uuid"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; + sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; }; }; "verror-1.10.0" = { @@ -726,7 +672,7 @@ in sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; dependencies = [ - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -757,7 +703,7 @@ in version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; dependencies = [ sources."double-ended-queue-2.1.0-0" @@ -779,7 +725,7 @@ in version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df"; + sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; }; dependencies = [ sources."debug-3.1.0" @@ -801,13 +747,13 @@ in async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; + sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; buildInputs = globalBuildInputs; meta = { @@ -821,10 +767,10 @@ in request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.85.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; - sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; dependencies = [ sources."ajv-5.5.2" @@ -832,18 +778,12 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" @@ -856,8 +796,6 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -871,15 +809,14 @@ in sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" sources."punycode-1.4.1" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" - sources."stringstream-0.0.5" + sources."qs-6.5.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.14.2" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.2.1" + sources."uuid-3.3.0" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 75bc6ec109ce..8f3be4cc8c7f 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 75bc6ec109ce..8f3be4cc8c7f 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index b532039ede1c..846e9bcfc12a 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -58,13 +58,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; }; @@ -81,7 +81,11 @@ in }; dependencies = [ sources."async-0.2.10" - sources."binary-search-tree-0.2.4" + (sources."binary-search-tree-0.2.4" // { + dependencies = [ + sources."underscore-1.4.4" + ]; + }) sources."isnumber-1.0.0" sources."mkdirp-0.3.5" (sources."nedb-1.0.2" // { @@ -89,7 +93,7 @@ in sources."underscore-1.4.4" ]; }) - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { From d491292288d0b9d8fb58035262fc97ab41abbdae Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Jun 2018 00:05:21 +0200 Subject: [PATCH 287/312] lf: 5 -> 6 --- pkgs/tools/misc/lf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 3089d6cace90..033e93609ab2 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "5"; + version = "6"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0qgvaa69xs97x42j1ikb03bzpm497z9h3qk7adbdippaqcj40s70"; + sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z"; }; goPackagePath = "github.com/gokcehan/lf"; From 394c3fe0abf35329cbe92f9e40d85bc1db159a9f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 28 Jun 2018 19:39:40 -0400 Subject: [PATCH 288/312] xcbuild: add missing bins A few from cctools were missing. Ideally they would not be needed but xcode provides them & we pretty much need to as well for a lot of xcode projects. --- pkgs/development/tools/xcbuild/toolchain.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 51bc5d60bcfe..3c20b510c3b5 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -58,6 +58,12 @@ runCommand "nixpkgs.xctoolchain" { ln -s ${buildPackages.indent}/bin/indent $out/usr/bin/indent ln -s ${buildPackages.ctags}/bin/ctags $out/usr/bin/ctags '' + optionalString stdenv.isDarwin '' + for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do + if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then + ln -s $bin $out/usr/bin + fi + done + ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $out/usr/bin ln -s ${mkdep-darwin-src} $out/usr/bin/mkdep '') From bf4d1f2c15b1b5f5cf613ec2d22bd8ed0faacfdb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 02:18:59 +0200 Subject: [PATCH 289/312] bustle: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1cc9dd6451ce..6cc6945bae4d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -598,7 +598,13 @@ self: super: { bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs; [ gettext perl help2man intltool ]; - doCheck = false; # https://github.com/wjt/bustle/issues/6 + patches = [ + # Add missing gio-unix-2.0 dependency + (pkgs.fetchpatch { + url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch; + sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9"; + }) + ]; postInstall = '' make install PREFIX=$out ''; From 780959ce8f517d6cc35c89908bf44cadd9fd8a90 Mon Sep 17 00:00:00 2001 From: Andy Dirnberger Date: Thu, 28 Jun 2018 23:40:47 -0400 Subject: [PATCH 290/312] python36: fix version in identifier --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 5ee5c9179534..fc68aae1c045 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -207,7 +207,7 @@ in stdenv.mkDerivation { withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; - isPy35 = true; + isPy36 = true; is_py3k = true; # deprecated interpreter = "${self}/bin/${executable}"; }; From 30c154d99b89974fb4a3a004cc875bdbb73d6204 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 11:31:16 +0200 Subject: [PATCH 291/312] haskellPackages.llvm-hs_6_3_0: fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 752c40ad0060..a9f21040ac0c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -269,9 +269,9 @@ self: super: builtins.intersectAttrs super { ); llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; - llvm-hs_6_2_0 = super.llvm-hs_6_2_0.override { + llvm-hs_6_3_0 = super.llvm-hs_6_3_0.override { llvm-config = pkgs.llvm_6; - llvm-hs-pure = super.llvm-hs-pure_6_2_0; + llvm-hs-pure = super.llvm-hs-pure_6_2_1; }; # Needs help finding LLVM. From b0f9175d03c30c1fef056679e98f0044d20fc41f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Jun 2018 12:11:05 +0200 Subject: [PATCH 292/312] sshfs: 3.3.2 -> 3.4.0 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 6f2fb68775df..e9325e9b18d5 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,14 +5,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.4.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr"; + sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; From 35f957a0fa1f72f0bb4a457d5d5bc87270ea0fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Jun 2018 12:48:50 +0200 Subject: [PATCH 293/312] abcm2ps: 8.13.22 -> 8.13.23 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index e9eec597384c..1fd092577f74 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.22"; + version = "8.13.23"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv"; + sha256 = "00bc4vsdvnyznfwcrkij02n2736nsbjlrh0rng96zv00p4abv4ad"; }; prePatch = '' From 1a589cc42247fbaa3168ca431c401aef9f8aba73 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 29 Jun 2018 14:19:32 +0300 Subject: [PATCH 294/312] pythonPackages.txtorcon: 0.20.0 -> 18.0.0 (#42754) --- pkgs/development/python-modules/txtorcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 09004e9337a0..e369e13cb957 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "0.20.0"; + version = "18.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e"; + sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1"; }; # Skip a failing test until fixed upstream: From a4765957fd2735df5f8f559f7067c88b3b6d7755 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 29 Jun 2018 14:20:38 +0300 Subject: [PATCH 295/312] pythonPackages.salmon-mail: fix tests (#42753) --- pkgs/development/python-modules/salmon-mail/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 19ddbca4d03a..7b06c2277cd5 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -14,6 +14,12 @@ buildPythonPackage rec { checkInputs = [ nose jinja2 mock ]; propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + # The tests use salmon executable installed by salmon itself so we need to add + # that to PATH + checkPhase = '' + PATH=$out/bin:$PATH nosetests . + ''; + meta = with stdenv.lib; { homepage = http://salmon-mail.readthedocs.org/; description = "Pythonic mail application server"; From 474fd13606af1cfe54398f5bf8a2c53f9c56e75c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Jun 2018 13:07:19 +0200 Subject: [PATCH 296/312] androidStudioPackages.beta: 3.2.0.18 -> 3.2.0.19 --- pkgs/applications/editors/android-studio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a82e0bf20358..1fbeda6681a4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -43,6 +43,9 @@ in rec { beta = mkStudio (latestVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink + version = "3.2.0.19"; # "Android Studio 3.2 Beta 2" + build = "181.4860949"; + sha256Hash = "1v1h42xp2fxj8366q9l9b0shk0y1vz9kny0rf7y48kyr5h9glnwr"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; From b00d53fcfebaa06b864aa5f27ffe2864d8617635 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Jun 2018 13:19:10 +0200 Subject: [PATCH 297/312] androidStudioPackages.{dev,canary}: 3.2.0.18 -> 3.3.0.0 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 1fbeda6681a4..2e82216b7e5d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.2.0.18"; # "Android Studio 3.2 Beta 1" - build = "181.4847800"; - sha256Hash = "1ipdvrx3qxwygq72jlf0dl4haxviscl41q18kclg519r1zbzd4cw"; + version = "3.3.0.0"; # "Android Studio 3.3 Canary 1" + build = "181.4861037"; + sha256Hash = "1abilixr386x65qzgp6pwdn41y1xi9h8yihgxhc1c97n90f5gab8"; }; in rec { # Old alias From 180855a1fe71d406462a687531961ddf5a27fd42 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 29 Jun 2018 13:14:25 +0200 Subject: [PATCH 298/312] grafana: 5.2.0 -> 5.2.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bf97ed34a0f0..217ac3f6d914 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.2.0"; + version = "5.2.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0ybnah8ziyawmmwrvm327xvr6cjbzgblf5f7qwmz6lk7irh8d9ra"; + sha256 = "0gv7g6ddcmdkjd1xp9dg2kq7askzaw1vkmcii21glqb74k2jfg74"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0ir9dhwm6h4673ic4pwhfwmg6jz8m8ia98cjkr9b4c68yrs1dv5j"; + sha256 = "0j69a9cjvkknq19aa2l634b48zy1lwmv2p676hzc856zgq3h6m9m"; }; postPatch = '' From f4e929497049414b87d5598acf788b90a9de9787 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 28 Jun 2018 15:07:04 +0200 Subject: [PATCH 299/312] puddletag: install desktop entry and man page --- pkgs/applications/audio/puddletag/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 00f58750408b..69c79c76c8d4 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -27,17 +27,6 @@ python2Packages.buildPythonApplication rec { doCheck = false; # there are no tests dontStrip = true; # we are not generating any binaries - installPhase = '' - runHook preInstall - - siteDir=$(toPythonPath $out) - mkdir -p $siteDir - PYTHONPATH=$PYTHONPATH:$siteDir - ${python2Packages.python.interpreter} setup.py install --prefix $out - - runHook postInstall - ''; - meta = with stdenv.lib; { homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; From 4f3ba3b1f891c391f3a293564fe62a812b48766d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 29 Jun 2018 08:37:25 -0400 Subject: [PATCH 300/312] linux-hardened: Adjust for Linux 4.17 --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index a00ba9ab7b8e..5ae128741129 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -55,6 +55,9 @@ ${optionalString (versionOlder version "4.11") '' # via the selinux=0 boot parameter. ${optionalString (versionAtLeast version "4.12") '' SECURITY_SELINUX_DISABLE n +''} + +${optionalString ((versionAtLeast version "4.12") && (versionOlder version "4.17")) '' SECURITY_WRITABLE_HOOKS n ''} From 54f7949636068ce76f6996891924258bd3ab2f42 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 28 Jun 2018 21:35:07 +0200 Subject: [PATCH 301/312] eclipse-platform: 4.7.3a -> 4.8 --- pkgs/applications/editors/eclipse/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3a09b5c6be47..431b01f7a72d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -96,7 +96,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-47; # always point to latest + eclipse-platform = eclipse-platform-48; # always point to latest eclipse-platform-46 = buildEclipse { name = "eclipse-platform-4.6.2"; @@ -128,6 +128,21 @@ rec { }; }; + eclipse-platform-48 = buildEclipse { + name = "eclipse-platform-4.8"; + description = "Eclipse Platform Photon"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; + sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; + }; + }; + }; + ### Eclipse Scala SDK eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest From 78601c097cb5420b43fda3be44e5e9d497a1980c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 28 Jun 2018 21:36:53 +0200 Subject: [PATCH 302/312] eclipse-sdk: 4.7.3a -> 4.8 --- pkgs/applications/editors/eclipse/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 431b01f7a72d..a2d246809c9d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -165,7 +165,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-47; # always point to latest + eclipse-sdk = eclipse-sdk-48; # always point to latest eclipse-sdk-46 = buildEclipse { name = "eclipse-sdk-4.6.2"; @@ -197,6 +197,21 @@ rec { }; }; + eclipse-sdk-48 = buildEclipse { + name = "eclipse-sdk-4.8"; + description = "Eclipse Photon Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; + sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; + }; + }; + }; + eclipse-sdk-37 = buildEclipse { name = "eclipse-sdk-3.7"; description = "Eclipse Classic"; From 8e78a9a68fea58147541444e9cd57d7043be3ee7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 28 Jun 2018 21:37:29 +0200 Subject: [PATCH 303/312] eclipse-plugin-jdt: 4.7.3a -> 4.8 --- 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 801583299ab0..28fe3e294b5c 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.3a"; + version = "4.8"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip; - sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip; + sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88"; }; meta = with stdenv.lib; { From eee65657831ddf0fca1c01e6ea2e6b6759ae80c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:49:53 +0200 Subject: [PATCH 304/312] gspell: move to top-level --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../gnome-3/misc => development/libraries}/gspell/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{desktops/gnome-3/misc => development/libraries}/gspell/default.nix (96%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d0c6558a611b..c035dc408dc0 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -52,7 +52,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3 + inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; @@ -375,8 +375,6 @@ let gitg = callPackage ./misc/gitg { }; - gspell = callPackage ./misc/gspell { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgda = callPackage ./misc/libgda { }; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/misc/gspell/default.nix rename to pkgs/development/libraries/gspell/default.nix index ca1fc3724fca..42c5f88e7f3f 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -22,7 +22,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b284bffef495..c477767d7072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16429,6 +16429,8 @@ with pkgs; gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; + gspell = callPackage ../development/libraries/gspell { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { inherit (gnome2) gtk; }; From a6f228d7941d55312e797cc6ed099f85f4f9cfad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:52:28 +0200 Subject: [PATCH 305/312] osmo: switch to gspell --- pkgs/applications/office/osmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index b5475ae337a3..20f8b428f0db 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }: +, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { name = "osmo-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive - gtkspell3 webkitgtk libgringotts ]; + gspell webkitgtk libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; From 0c083fc1f6a653d6aa0f5eacef1905f00cf412d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:57:10 +0200 Subject: [PATCH 306/312] =?UTF-8?q?gspell:=201.8.0=20=E2=86=92=201.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 42c5f88e7f3f..051228aeb152 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,7 +2,7 @@ let pname = "gspell"; - version = "1.8.0"; + version = "1.8.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv"; + sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1"; }; propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig From da7d4c367669089aee388be7031f8d242b3bc5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Jun 2018 19:21:58 +0200 Subject: [PATCH 307/312] python.pkgs.flask-caching: init at 1.4.0 --- .../python-modules/flask-caching/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/flask-caching/default.nix diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix new file mode 100644 index 000000000000..84f549231ce6 --- /dev/null +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "Flask-Caching"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985"; + }; + + propagatedBuildInputs = [ flask ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + py.test + ''; + + # https://github.com/sh4nks/flask-caching/pull/74 + doCheck = false; + + meta = with lib; { + description = "Adds caching support to your Flask application"; + homepage = https://github.com/sh4nks/flask-caching; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17c4d13561a5..e46770624282 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5527,6 +5527,8 @@ in { }; }; + flask-caching = callPackage ../development/python-modules/flask-caching { }; + flask-common = callPackage ../development/python-modules/flask-common { }; flask-compress = callPackage ../development/python-modules/flask-compress { }; From 38094de6b67701960c2383f60fbf37448473faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Jun 2018 19:23:43 +0200 Subject: [PATCH 308/312] python.pkgs.flask-common: use flask-caching --- pkgs/development/python-modules/flask-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 05a728d78cb5..05385e08d05e 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage -, crayons, flask, flask_cache, gunicorn, maya, meinheld, whitenoise }: +, crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { pname = "Flask-Common"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9"; }; - propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ]; + propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ]; meta = with stdenv.lib; { description = "Flask extension with lots of common time-savers"; From 25342cd6bd46f12e7e3eda17845615870dc74ee5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 29 Jun 2018 13:36:59 -0400 Subject: [PATCH 309/312] elish: add shellPath attribute Fixes #42764 --- pkgs/shells/elvish/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 5a00a1ee4195..086fca480bb3 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -20,4 +20,8 @@ buildGoPackage rec { maintainers = with maintainers; [ vrthra ]; platforms = with platforms; linux ++ darwin; }; + + passthru = { + shellPath = "/bin/elvish"; + }; } From dca7e24a11940477f6a3568fc49bade96ca59514 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 29 Jun 2018 13:41:46 -0400 Subject: [PATCH 310/312] networkmanager: Expand dns description, integrate with other services (#41898) Rather than special-casing the dns options in networkmanager.nix, use the module system to let unbound and systemd-resolved contribute to the newtorkmanager config. --- .../services/networking/networkmanager.nix | 85 ++++++++++++++----- nixos/modules/services/networking/unbound.nix | 3 + nixos/modules/system/boot/resolved.nix | 2 + 3 files changed, 71 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 816234506593..4e51725b19de 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,18 +9,11 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - dns = - if cfg.dns == "none" then "none" - else if cfg.dns == "dnsmasq" then "dnsmasq" - else if config.services.resolved.enable then "systemd-resolved" - else if config.services.unbound.enable then "unbound" - else "default"; - configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${dns} + dns=${cfg.dns} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -217,19 +210,73 @@ in { }; dns = mkOption { - type = types.enum [ "auto" "dnsmasq" "none" ]; - default = "auto"; + type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ]; + default = "default"; description = '' + Set the DNS (resolv.conf) processing mode. + + Options: - - auto: Check for systemd-resolved, unbound, or use default. - - dnsmasq: - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. - - none: - Disable NetworkManager's DNS integration completely. - It will not touch your /etc/resolv.conf. + + + "default" + + NetworkManager will update /etc/resolv.conf to + reflect the nameservers provided by currently active connections. + + + + "dnsmasq" + + + Enable NetworkManager's dnsmasq integration. NetworkManager will + run dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + + + It is possible to pass custom options to the dnsmasq instance by + adding them to files in the + /etc/NetworkManager/dnsmasq.d/ directory. + + + When multiple upstream servers are available, dnsmasq will + initially contact them in parallel and then use the fastest to + respond, probing again other servers after some time. This + behavior can be modified passing the + all-servers or strict-order + options to dnsmasq (see the manual page for more details). + + + Note that this option causes NetworkManager to launch and manage + its own instance of the dnsmasq daemon, which is + not the same as setting + services.dnsmasq.enable = true;. + + + + + "unbound" + + NetworkManager will talk to unbound and dnssec-triggerd, + providing a "split DNS" configuration with DNSSEC support. + /etc/resolv.conf will be managed by + dnssec-trigger daemon. + + + + "systemd-resolved" + + NetworkManager will push the DNS configuration to systemd-resolved. + + + + "none" + + NetworkManager will not modify resolv.conf. + + + ''; }; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 07936faaa133..1a35979ad44c 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -131,6 +131,9 @@ in }; }; + # If networkmanager is enabled, ask it to interface with unbound. + networking.networkmanager.dns = "unbound"; + }; } diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4d9de020c84e..e1095fb988eb 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -147,6 +147,8 @@ in ${config.services.resolved.extraConfig} ''; + # If networkmanager is enabled, ask it to interface with resolved. + networking.networkmanager.dns = "systemd-resolved"; }; } From 18d78e2e48f07c45a97c6c03198b0aa3ed3ce2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Jun 2018 20:03:08 +0200 Subject: [PATCH 311/312] python.pkgs.pytest-mock: 1.8.0 -> 1.10.0 --- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 88b6a662d471..c12d4b8add03 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.8.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994"; + sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; From 2f4001f41a44c49970112b7885eae00fdff16eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Jun 2018 20:55:43 +0200 Subject: [PATCH 312/312] Merge #42729: firefox-61 and related updates (security) (cherry picked from commit 8ad921dc942b43b8f6ccec529834649585ef0df1) Fast-forwarded to get to master sooner. --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- .../networking/browsers/firefox/common.nix | 23 +- .../networking/browsers/firefox/packages.nix | 32 +- pkgs/development/libraries/nss/default.nix | 6 +- 4 files changed, 427 insertions(+), 420 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 184cfcdce3ec..327cb4372c84 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0.2"; + version = "61.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ach/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ach/firefox-61.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "68e9831e3814f7bce96365a88c1fb00d1955ea0e45f67a698ad0ec7f193684a9fb1ef0b145e212215cc5028c2065232badc27db328aa20a20d558bf1464eff1a"; + sha512 = "d12d3e2a826ac5a7bfc229897b717d68ad3b862d0f9cf9e9b1f776ec2fd7bdc2b3d84a91bce46d99b9ba60259ad0c25dc4a5f0a83bf56d579d93e186521f103f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/af/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/af/firefox-61.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "26985220e2fb20110ed9e71382290554eb279505471952f0557e69aaca64b6c7602b0d405c3ba0f4ac451963d4727f62f2cb525f9fe279e5380f5e146352288b"; + sha512 = "6ffb7b77ae3fa5bde851344f8e6e7f865ec0556348bfbf2c946f504cc748ead24f864e9e356ef08ae09dbd892b9070b22c30bccf4b7ba8700a61188167769043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/an/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/an/firefox-61.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "68a80541f18686b3060b49dad145775436fa318ab5ed18229d6e6e9a807dd4de777326595b214cfd31dc8a482f48798ddb5eae1a4433ca54236bc8d98898c90e"; + sha512 = "1756b3350042cce59293f1fa09d96b37e0616b21740ed4e181df27bd7b36c9d83a4da5771bb9884a2dfb272e79d91d81a02cfca19c52219e56ab0e9683245cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ar/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ar/firefox-61.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0579222cde4a1ffb006c7322aba80556bcda4eaf592302cc2af52d178f90dfbeefb021e1097ea992eb3dde1c03b43145831a0dae325523abe2b5ef72da9cea1c"; + sha512 = "8c36e5812256dc7267fab6f87146576af04a864c2ccdafd86b91fc73739f0cfe629695e2b9c10e34d6d712e72878da188a8cc8ce3616aa3e9a95b65f13d26b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/as/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/as/firefox-61.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "27cb434d6c9b2eda3ca08daa2d89a7b1f81815f7605984fe6ed4803196beb7eee844e79c1064a71cfcf5e3b113606a76b557c2bef54064410ecdaf732ccdfe30"; + sha512 = "2fa112bce2f0f4431a15d08974ec7c2e5773feaa47c03196f65718670c7d7abdcae740d6f6644480d0ed1d8423e1110ba147f3596ecbd1a1852f24e4930d935c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ast/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ast/firefox-61.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9eeee72b3bd390f8e7978dfe0b8f03d0b5745197d50ca85f764c64a0bccc7a95db872dab3416f73f44ac9c9e1cc6a096f7a2154b2e8f6e4fcb0ceab48598e7ec"; + sha512 = "e95de31719a0441547e6d7cc5aa3e3f758e3406513e56ba8cf1793acdd8d7d3fc0e7f47267c0113fc50595f30c46b5277fffa8a738800befcba842832f3060ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/az/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/az/firefox-61.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dc94785cf955366ba94cce3bb6435a1aa635cbf65e4cd8cb6ac5330470d84d2349b6ff22b9d3b6d6b5a47c4bcd53f9f615913ea476a7555b196c5c39b5adb808"; + sha512 = "80cb9f870291e60b6e03f95c96c586cb76572de01965306daef00e9131fe39c56dde7061e2dd3e167a0afcb2a81a04e311fe4bcbab4d5349098e655ea172f81b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/be/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/be/firefox-61.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79af55191ede8277e94482823e9a54ff0f6f3448c6b0753742977feaac66301ca7d368ffe2ac8b63ae1ea053ee9f9a1ed3228c3ce644bbdf9853cdda7b278830"; + sha512 = "546d82add8ba20cb06bb3b7ab8d8196bbfa96cb7e9abed6bd8597ccaa90ecc90e19e463e3e9810d5dcd95cffd7e11cc3bd47eeb255e3070b25dc52a57f3f26ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bg/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bg/firefox-61.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d286cd0e6b40a9b71caad4c86892484fce60f57fb6ce946fd63179336181bdac9fedb4a92bcd19a5ded08a21dff256d005cb08d13bf3728aed5e663f5a1220de"; + sha512 = "e3a9994bc1d85f1dcce078eb483c5213848fa722a049bcdf22206b4fd4498233452a33eb50670e297383c699c1237bbcb704f37b611d1fa6bf4013bfb397916a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bn-BD/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bn-BD/firefox-61.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "8d0c40bdfc4d191bdc3a4f5900217259c89cad292fd053878b6c4c98407ba0582ada5abdd3839b225f063fc4cdff13c96cc61609478b9f8a18a1c88b5d271605"; + sha512 = "9f22c3af1425cb64175bd2c6d824c967886d56572e7e182dc25f69cbe76f880a0d804ea7e49240f60fa559aa68b696ab6765263dab1c953612a4071ec9902781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bn-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bn-IN/firefox-61.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c3a05e4a932b19841fadb04b20dda770077cff4b45543b2b3d8a78f092e856843941f070eb338455b22b04d6683161fee1b65b1b432de4dafac987b40d91cdec"; + sha512 = "a95f9f39add0b45e4db012484265a84d972e8319f3bca387d5bcaed85f31e39997aca7742001cacdb19445097fabef8a34b67f56b93d86b49e8723e040daf793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/br/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/br/firefox-61.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ce729cfe0ee8b308aac5252b74c562a57e0d6ab63b9971b7345e1695e95b1946d2e621d686cfa0d64e44e3e591a15d1357b91928c1376816cd8e34293d16091f"; + sha512 = "c12d971e521d0edd972f9c191242eb699942969b61fb46b4222fb583f5e25f1d5b36f87305ac1042de15f260a46c58bf35a83e1554ea0c9b3a23744183c2e9f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/bs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/bs/firefox-61.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "05559ec50f02f4a2865c65dc315f80c28c83b3091d38cba68f58f3dc461d8f15dc4c597f8f9e851cda79e2d8398afa905b8249822b55c9af3f92b65bb7cd4c13"; + sha512 = "69b76469c757be20b0015e22e7e53880e32c9ad9c30170d4296131d9c7fa66e063b2c1ac2ef2b1ba8b6aff09b3989224109496353ccf01c8de1184ccbff8376e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ca/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ca/firefox-61.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "45d7ac493bcd7f9950041e66e9f3146814dc624facfab77a5f1efd601b8725e400297b319fbe440f8578f5c5e02dfdf56dece55fdd3ebda10512f0e74ba8cc03"; + sha512 = "896fde21c49fb75064e0c1efaa7a771b5141f1409cb57faebc6d3c10c3e90ad8ea8161687209c3d00722b728be1d8b664fbbfec0585633229ed69bf62c53afe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cak/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cak/firefox-61.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d96b4cb7dc50b01ff35cfd4c5921ab91d045410a38cf251cba3ea5236f9e4823e872b292dc1b1528cfc0249b93ed43f40ff6d6356bbde6daf560e6b8a8eed2e3"; + sha512 = "82efee3f1f23df2a8b923fdb8486703b124ced86c17de279a621d747dd8038af2a7e4af35b42d2c76abe2a8afc4cd21f9d4216fd75b02695b0563dc0dd655aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cs/firefox-61.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d7a511b8fb9fcbaf484eb9723fed9b82003539458010ee46526951aa9378e2c93c96811b14812fc8bde4a615e8524cc48c17beca20f185f666351b794e6d6026"; + sha512 = "c5eb9a60e339e05c8c8b16ba57e3b13f662bb0af42044cd7c70c9f9fe5c4dda16492d03d557ef90ede48b2b8a4e8845b0d3effd8ec85971e3855e8fce6675739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/cy/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/cy/firefox-61.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "efccda54fc035a09af67144577e32e27e61b4ef619c46bd1a87b65a699a8427c2ed93b6044949740025ba46d0b937e50a73b57f5b378d442c56c7acba86a5752"; + sha512 = "63bd2eb6f2a0591327299887aa449a7d83a01217410c83c23f7dd551fc1abd7abf52e19cf2f3629ef04faf8a79babbfabd2089553e619c7217b1be9bc6490363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/da/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/da/firefox-61.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "586828d3e81a355287fa3f2c9be5fb5f3a23b61a393089112921e9e6b239e630f45d6051f921307c21e1ad600a087bcd5ffabeccf5b5fab9041683f7cf9e0c42"; + sha512 = "cd366e8ae4669b167eec8a245935f1141961ea3d60fdc3e758fd69354c7c04cba68670dfaa1d27d7599dadcc29ed05d4f2aba0309ad80a19aee815b1b229de73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/de/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/de/firefox-61.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6db7cc3f2a8e157faec6a27e0cf99be78ef957ffa92238ea60d3b65d41d403b3478b8fde7f27817b91285b7efb2e9b76be3ebdf40ef1ab886e8ddd3b8abde0d0"; + sha512 = "ed88364a9f4b2643ffe0170d6bd9d68f7b99c6ce1189a2d87350535eaeab6632891cdaf48794d82af5818affad5bff38701f5871e5894dba246e1cd525c8f98e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/dsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/dsb/firefox-61.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "397ef9d40697d2cd33cdb31afd08060623cfaf1dfc2445afc21ac667f8e90bd26dc1ec9693c6d40bc5aefe7a04606e702f6e6c6fabdb2c7517f0488c96ed004b"; + sha512 = "7f0b8637ecebe140ae46139b3f51502870eeb37b2b2483df8456b46a2a5e0512f141a9f57a49dd9354054cb2e6b617055516543d7617cae375ccf9b6d4e1516a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/el/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/el/firefox-61.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d7e4d7521624a0f4f13287aedb9289e0bbc601f6c199819e83fb71836e0a8d754b32f71cba835f4a71d00029fe8dfbf1d44ae120b8943356c39a9507f2cf482e"; + sha512 = "9f932ee9654f985c756151e806c29e9580de60bef44a72764c03c3738767201136018afcaa2b25b65ef7f9dec6213139de94e4de0a857dc40931697cf5cce2a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-GB/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-GB/firefox-61.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e767e6c72fc29c0c7baf9abd956b6608dec7c8e7d2a45772a341d894e9076960a6e03adbafacd8ae7555a5db38940df570bb802035584be1e62e63d8bed5147a"; + sha512 = "2b6287f7e664316765eb51933c773a4bfb94fdee1f18923c7931534df50d99e1bed9c9c5debb19949151d39c6dde8550f6669a0d66008759282b792db8e0e5e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-US/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "58075442850d5e34a7eaa78e008a6f80321a09fbaa5bed698394659bc468d799d299ddad888b1def0d6b74899671e98e7aa918f247a57c42cd605b05276a9156"; + sha512 = "abe11590fb913c51bf66fb0865d6f8d93d9797993630feeb593cb44690134a57957800c6b9c7d986ea993884084450dc737ae7f3324430fe79bab2aedf082c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/en-ZA/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-ZA/firefox-61.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "422bc4d9695da1ed5c9269f9067d331d0b6c0849b12c61140e07bc7b475f121d07c97c0007f9e33e724451c63a25b9352326a6a321c3eea8506ab4a07ed67e74"; + sha512 = "0c047e120edc3595928bd5e9bfe0b301ab2530c33d302bf57a1443f9b1f3ed786a9298f5948dfe766b95ec18083c57302cb89e4da317e995c1320dbbe2f0b2e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/eo/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/eo/firefox-61.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d2f11b0d0f660305073570840975165a0900970fa63c28646eaba94709da0977229c3a77280d731ad98ef5c17e5d7ea230eb816c3248c25d4466afb9edaffe46"; + sha512 = "84130624312a12e208d3a944ae7fa117107528767fa997a10f97102d1154bfb2fe96d117d89deb2e7bb901c84cabfe711a4259ec90d22913b80b9821f10d1810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-AR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-AR/firefox-61.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "11a83e2ca6deb717659b845f850aaf3f0b90b4bf784ca8f2f095197c2c3c42c26c69488ab9dba3ce4b1bed4e89cacd8366ae9a3ce0cc96c02978c9bd6a55c3e5"; + sha512 = "256c9445729d14be034da2b1be1feaa7a9cbd89c32b96a3dff7d117747769355a95f2f9d8078003a65f784ab1dc434537ead393693c45de089187e0c5de6fb8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-CL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-CL/firefox-61.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2e1fdb10a04b771d8b29c9651a1984f1656ba54e7d8905bd625c9832093a69db054adba3a14ac28d92bd5706379757f2d9d66a03c57cce099ffd5d29b96d9379"; + sha512 = "bd6c81a0c4f99289dfedf741cef040d856881df8c110e2b60e10118cb363d9f2748cd31535584d41cce5657c6c3bce36a1d18e75afb962d83b6abe55ed843ac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-ES/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-ES/firefox-61.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "879380e144dade8568e49f74ee1b9e14bed86549cf6f8f6b98e84d9db72829ea28c36ddf53804bf697f16f74a86153b7071fa1056bd568533846ff2f46cb0e9b"; + sha512 = "ddb6350782cc7a3750219ad2529b10c8bdfbde3f41277d388e08f78212613cf66fcba6c3fa5a678b64366dbc9288cde9dcfa6a929225f6f1c387df26f7360855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/es-MX/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/es-MX/firefox-61.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dd87e44a2d1fc27666710a1c16fc52f8b7e075cefd6ee9039bb092d9e4341542256f458695c7e6df6c0f7e9380f867845f68d9c62a2f961d84922f74e8bd26fc"; + sha512 = "eb84132a7dd0b1b3b1a9203293bfea5f550dd8fb222a113fe9ba13735d00a971b7c0d74d8fb7956aed378c36194751116695439701ba84293979d12ec5b4aa37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/et/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/et/firefox-61.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1663bd14ab53722348ebb233aae275f291647c903c2756ac52bb4396bc0f946c0d9e851c0f88df32484f77d03404895ffa68ee0fc88955efc49c9693a1876102"; + sha512 = "1866fef138d6be7e2134d31539cbbe4e69c9e7f12517bd0df1c5d16f4b7831b0e6f0fb3c009a73d8f553c7e22cd65513c20c6b44a80dc5940ad12ddb922148e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/eu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/eu/firefox-61.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "42ec88730a68821186a7b5f750631a03490fb7c77b6ee31e7090b4dbeb36abf02fecfe301ed31e41eb0959b31677c994a40997a713488aac8f4657db4dc497ca"; + sha512 = "371e04af308a689da5e7615661a338239e625ed01800577826858c42478e4ed4f91a0d58c16e9f58a331de61a4f26469ee1de16171ea148dfe1045385c880b16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fa/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fa/firefox-61.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "382c8b844ea58a7ea4a340ca209c7a1bf381c14373023cbfc10b60d7aba900a96c4b71128f59e5bfdddf03b3560e7d8b89bd5792b130341ba49274a051ebd041"; + sha512 = "6f75a0e6ec02f7e3346562aeb23e17240270a8980381dad504713f2d4af0ee1eb9b6514b66c80e171517deb435ba6c619ccbe022889713b7d8d19fbfcac15ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ff/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ff/firefox-61.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ba2fe6d770b7faf3922210b32f8a34d054a06c4640197b5d63fdee55905438aa4a75bb87666fdf106e03e4444727114caccca2a5dd9fb0fa20f475cecb903224"; + sha512 = "f92bcb8c3583b31c6c79baf76ebc2d5f989baa50f140f5f97a35bde3e565cb4c3bdded18b009423fe4abb4efe7167fc1918ed55d1c467bddbfaaef5da093afda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fi/firefox-61.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0c7d80a8e04f693df8cd3e374d0a1fdb65b25615fb0cfd2a73b0f78257f8774057062493ad1224ebf852ddd3128e9bea945d9520be2c188089b86de36f169dd1"; + sha512 = "3b2cd406fea30bcad77d5de8127924aed78d28627dad1dd3b4b493c15e7c9a792b44500da8ce16fc4ab2b9f9d62f359aeedda332cebc4658e16b69c54aeac449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fr/firefox-61.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "cf798f34be131f30193ebfdc061edfc7a18b3793bf68b63d3d5c0b98b6208bca1173c3a785240f07f3c6cb1ca912e25043bfe407ad6eae30f480e4f9c8868f4b"; + sha512 = "ff9b2f6920b5d8b1914ab4e959eaadb3c9b4efa5f329e73b8a8a15f33102e415d39534b985ae11996efac6b6ee538f3273ca25d8c28764ea46bc6de43113a946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/fy-NL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/fy-NL/firefox-61.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0a2698c1740ab303a100e09f5d5ecb28eb042199cbb3705aa11f57aed331e5bf71cf8709d9c8ba4693b0fdb8fd9597006f961bd481ad2baef6ebe42c7c6cf32f"; + sha512 = "51c116df6e42b1b0e466d4a018d22791ae84935cd603a2ddf556d985874b1276f4762fe039e5ba73524fb5f9a25ebe9ce52d61dd73da49bf2539167f70a9dd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ga-IE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ga-IE/firefox-61.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "21ac54f135b1dae3f128a6e2fe8376384e951e64c019930cad82346a8d7b827e62e6caf62892194d0b3b7257d66bee9c4bfe4184c5cc146094f26c497f1066ef"; + sha512 = "6405edba8de9c822e27f372dcfbed9257313d0b34f8a23f2e999dc17222e94e5266d6711a60067f786cea4e010a1f30533308d535302cfc1937720e90bbb0b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gd/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gd/firefox-61.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "19bf6f1905b8fa6b1efb0a4fc6dd35ae3dece610651abc8b927f0527ee0ce48074cddb840331b639069fda5509a7c0248d9862e45d318aebda4cfd747b966511"; + sha512 = "e35a04ff6aeb5c2ddfdd70ea75d52ab2f7699333613c1488ae0edcd2edcd2045db0031b89d96a7c934b5505a61d7429ac81b1f5739d0cc578c736d1ea26e027f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gl/firefox-61.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8ec3abe16c1af9419bf67c295b624483713332cc1de8363d99c383d6ade93b3778718f2572b00360a890aaa01a0e5104537277e616e2762d15a4736fd27bc2b2"; + sha512 = "b989804a3fa681f4f3ced106e14a420d6f27d091a6a3ed9ac771f750486b8c468e5a247d3e21fd5ad8bed8a463f0f1857c97be86fb4212ab7465dc8ab986657f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gn/firefox-61.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f5c2bedd34e595759aa9ea229576fd8590a4f777ef5826a2758273bb2b7c27aaad4fcf3e719f3b67237186b46528eeadbf8dd42e514b685e5f1b7ed2ad01df56"; + sha512 = "7b5b423364164b2d8061bc7df5074032acd57557a293c6fd269c6adbd3e82f1d2d18ed313764eec644d0ee3ae1eeddf3ce621fe67cce7e749c521c01908c9de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/gu-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/gu-IN/firefox-61.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e42965223cd29e97b1d13e242b640300d16b1234e8598fb3fd0cf2b3c572ed83284cec727ee189ab918c0d6e287c2682af56d6f44b332b6b8af6cce8dce2c936"; + sha512 = "3d5289e207219485353de36e7bcb2d1dd38aeb3700f80188d10cf0bc16e07e4a2dd98844063c93466a78c36660f5934c64cbf0b3fa73a7866c157e3b9c98aca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/he/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/he/firefox-61.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "9d63b78a18612f28b9e9bb8f5ddd9df7c5a28ddb559d8145d04ad873e644814009e4d803a09025528833b9c59e93896be941ddfd403561dcb9adaec99ab3692e"; + sha512 = "ce3c739cfee7f58960cd6ebf727f9eaa2821a8cef52da4b9ef98507ee8187a6df9d8d5c950a8f3f54c077cf516633907f76f4e42af9cc72b7a3b423a2c38ed44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hi-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hi-IN/firefox-61.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6631cf0c4c7520c2c9b06fe6998eeaff68b80940c7263ca1026a22a7f308709be1ab4fb7fc91873ee6be3d4d9b854bece812065247422a59089796e1929fdbb9"; + sha512 = "d743501572c5111b01e822eb6618f5aa7692c680ad8565165048e3d722a04f9b623cdbf85762d2fa02519774d8670a4f00fa9080d4b00ebb8c9226d6f6176dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hr/firefox-61.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "dce0bd4a071829106d675901a948948326f2aa2b7bde74314370241e3388a826fbe2b0fbcf7fe3b4bc91dc1291783ad04fdb7fc6fbabfdf75a79214d77d12e36"; + sha512 = "c0e9b42c49e723b2c25dffc4ed84ae34dd686db8752bbded98bdb609c6c58f872209fae93de638329d6aca1fbb521feb2a65ba0add897acba5f495e88f0ebc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hsb/firefox-61.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "27d82d26e0f64bc17d38116855871f27ed01c2869f853c546211cf5cf55f40730d04a536eeac2d61deb6a6bd4cb492311af289e05b30eb3f24a7415b6bdd11a8"; + sha512 = "b54f977a15202547aee13059d3620006788a553ff3781c8c3d81107c1693cb750a8b08a95e254629357e5b7b4926edf9f81f25e5bd06b6566bb2b8ca70aeefa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hu/firefox-61.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "e0ce9800431237dd5db846456d8430bf2a694b24291cdca3ebc87b6c7e2b34f04408490f32e44c8c0b68091f71e83e91139844d6a31223340c05f5d73bffd8ce"; + sha512 = "0d90d1b17eed1f1e33527e028107461ccd1195cc1b4658571bcc80ae8dcf91a4b0ba28fee4a5699579b02887d2ac5776e1d4e1b32c7b81fc13812c4c3e62379f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/hy-AM/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/hy-AM/firefox-61.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "46f37fac95294a3bb6fdb32d0f4e75c41afa0aca75d2de76045f4ab2bc9ed37f89fce12491ea5fa95bb95cc87c9e5d402be1b89937636c5139c81babaae19de1"; + sha512 = "6799fbb4a16ae2ce4eb14789968184e5c2875a9a47319f83093500b778a0785dc7f099c5cd349cdcd41249730caa9c73ce615d9d6bcd2ac49e02e921fbc039ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ia/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ia/firefox-61.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "ab31636a827ec54f309d30fa4a991dc56f24c4eadf305dc318f31c8074d64e057cdb02f657b5b164a58c9ef42fdeee9fd96fa5bd6644c8a003247dfdb6f6380d"; + sha512 = "60097e720a6a9a318119d76c3c6f8689938a4871c4cd74019ccb0d2f41755e9132b62be797b78ed23204d2e725a018f5bccd10d5e9484b16f207f362bb36ddbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/id/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/id/firefox-61.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8e3a627bc5664d3899a968305818ada76446d3fc59eac235462875d49eb671c7abb9a381f92c1bdd5d31f0f01f948588b09643cb8faac4d7ec596c71262c7102"; + sha512 = "cf45ee3185f2e6433f5b571fa20432e680bf2a4fcc3b6ff5877056730af21c0188b563af7548465dc65b88bc2c7bf666f5102283d5afca8689e36e96a6b049c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/is/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/is/firefox-61.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "7d182df6343c0470888ff4def117ac60a719a3750dfa4728c5bb4b2e5098fc8bde959b2caf4d96d54b1d0b5d6ac32f553f70b28660351c8e0fb03b5612cd5487"; + sha512 = "0af4bbc5d00817407f049ebcd8906fcd3189e8fd31688af1cf7b7aed0d3e09a41a9e1975b23917df0aa83b551b290c095a994707ed98f1e40b0900fcb6312b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/it/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/it/firefox-61.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9b8429e135116f297a45b1fce0e2e9a57e133c3469d97201d1f5af51bd2073c17379494f3caafda39bead076edda3d0f834e67cda5fc6fef9baa5a77083e4449"; + sha512 = "1f1cf5b0ec8ae4909452a4110d205f6c5876108f9ebeecc7a7dd5e679854fcaae96059a57a57de7f9c37fc8322cfe6967903e10a2280dc3c2184e17d04d075be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ja/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ja/firefox-61.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "03fc2e537ed8e8ad35d345d0b41c1f42429ffff5c5bfcd53396f4f8e86722dfd17ba2656749fe56757d026389332c906d576152372a2a6b99f2259608250d2b5"; + sha512 = "2fe1fed228559c08ced184eb1bb8fbe404b11a7d21d8a12c7890959283a4472e45bd6feee789c545fa160ef1cf6e6d10c6728c62a50416598e418d4d84020546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ka/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ka/firefox-61.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4a97083ddd8884e2a57a16f2efc0938a85f5b55097962ee857630ebecf10237de24e7c0f59741da32e69af47b49f41bdb198fdfb4cddfa6c2a83ab139caea960"; + sha512 = "1319ecf7b9e0ddec898757430aaa45b5700ded401a35d6e3899d440be4fe49987e0157ffd219785386d521b3ffe20f865da9a9333fe543c309302ecc98b0742d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kab/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kab/firefox-61.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bde834fabe3bd6fefe6cf819a30c650d868050a1d72353a0e6e370d90b46c71845ac20aefb0ad51c3a828d730a3b94ef9932ee80ad792e2bff003f31245ec465"; + sha512 = "12ef2ec41fefdffa61f7fb4dad46dffef322fafd25d513cf7bc5753170f771a5373cf79a3794f2ba9ccd84b6203453b8f68db11e09629851eae027d3b30bc394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kk/firefox-61.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "8c154331e3b5e3a340f4fd36774f4f4ece2d4608800551de2ea77e9ad863582fe79819a147a14d99f456ac50bb3b5dfc4ffc75d97ddbf575b009f35ddb0c50f6"; + sha512 = "59098181301c756e62a6d661a48856a9d252797c459666897c0c74364586eeeb1a68ccb9a2a0d126b50c78634f17f06603843a4239a2bff018311bea30f093a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/km/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/km/firefox-61.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "17103daa05445ab59e030101521e02405352e1f026b51ee554cba1fa88cd2cece673d34f58deec55de3f55316782dbf64121248490689c576d04cc05a1b8d5c3"; + sha512 = "d394217642ad85b59b4d89f1571c477cf11d4ee02390b441a480409776ea44d59fd813ab3be6368f89d857b6607f37f06603a3842985c6577391d89ebb1b9437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/kn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/kn/firefox-61.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6baa49a08395761ed0979a34b8eb94c0b8011b956f74561253f1fa0a972a9c5de5c1f4ffe3317515ea80092684b9ea95817a6cff3783bf398c216f66ac032c9b"; + sha512 = "57833cf3cd49a518a8036943c026b02a980b296fd5ba9cf66cb72a5b4267837c05b65f30c4ce5e743557fe36af8d4bf659b8fba573b7046ab2ecd5f5b6009e81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ko/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ko/firefox-61.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "119a4829d184d034ca5fccbdc91627fc06670cea54282df77e87b362d172615ce445e37947a12948fe692e611e05a1b5ded785ce69df6c933e9a9cff234c9a81"; + sha512 = "52c5846a9255cbe18fbeb559e53f2c874139f5462e423dabccd45112df444b4317c62d4957584047eb7362c01b27131f6430fabddb4cdc907e3ed5fbffd92f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lij/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lij/firefox-61.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ee2b2a3b8e7805d7fe42aff4b9892348dda1ec422f70260095b155667bf2cb0bac3cb4c646319f2c567268a8aeee3c3c7f7998dc779cc00b24a28ea275d99461"; + sha512 = "310a7d9d80cd49a1a9b1e68b3ee52e79f77404c36b609ff50c50af51a4cbcbf346fbc46aed7d91cdc6cd80235f090c11d3863fb08c665276d5d6b86e5ec63d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lt/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lt/firefox-61.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5d3fc60ca0a2d60b45a74718bb28c4a6bf8c92187bf1b5976b827e461af5944ef403d00e93e03ee06f9cf5cd57f40ca1a4d1041c95751d4cd1882c2bcedc92df"; + sha512 = "bd3c6ed1834b9b8331073cdafffbcb0aeee813df66a7c78caec1dc0298d24e14a1e74e1bdd8c7def8ab11578f2c30bbec9c60edf8359fc1d9d16a23b0c83189f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/lv/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/lv/firefox-61.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9072bec1c1f4c11a3c8bd21e6217122d08efe8547dff19e0addd5ac4fc56299225af583bba8d6779537b16c9a443219438fc90801b8e1e0c9d639a350f0243d2"; + sha512 = "3e03383df3286424ac5030aac90571dc3cb703ede6cdd6085027effc91153f3abc4cf258d6e642591f963884ee4e09f08203fc24bdae1297526e5a85ff913cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mai/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mai/firefox-61.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d7d989e9d0c274dfda2579c0e3cbba346ed42d6cfefb950d43a49a8c2ded83810de1eede4e894d6d440a4d03f2db239c92a30fd3ffa51232705f8b4cba31e0f6"; + sha512 = "f91928ffc49ee79a5b987d7fb7a2dec3fceb139e462cd5c12cfdfe668d78ff73576d7014eaed02881825f2fbcf20a6f3af2a5a3b3fd20cca25c02d1a50ed21fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mk/firefox-61.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "924afa02079162cc4014f92b851089f8589a56336dc5fd2cbe62e2372c751792427fa0e592d173a74064bf5371807382ec34a6a6b798cbcc11ee1a36a9197d62"; + sha512 = "197eb5238bbe133ccac85e3a329aa27dc27a73c089aa6b191940a8817b8369bd0aab3c06cf7a00e597ba01b3cc2d53e0fe807a632cd6a45ef309eb57e2bbd104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ml/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ml/firefox-61.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3a1e5ac314136ac109b6a32db1a31e2d6a4b905e53095c867e219ae19b570774f3a5ce37a462e43bdf55175b867fd1cdfbddd81e4297f7423bf56fa2656bbff2"; + sha512 = "00a617df069c7038327d5b66bf309bb708b0207b9f0018e29e4da310a9f98a742966d77228b6aff2f401355ba95fdfeca8c765e03f604d9e6ec1f6cde3825bcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/mr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/mr/firefox-61.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a99e311c5639651758142628bcfe50e0006192406896dd7aa18ae86dd9fe4602116235c19e28ea1a5c5623b8d361bcb7ac02b411318952c6c77b10b539aa314d"; + sha512 = "0264606e0626f715575fdb4cb283a69895364469bee18c9db5c385845398bc1042a7a7f5c0f42e7eb0f43f29e57dfc218489f74546a25ee054f1bc72463cbb4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ms/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ms/firefox-61.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3803232c95c80362108a5bbaf5b9fd22618c483dfadab329db8d320919aea977f1cdad2d60d8add0e3b0f8eb3c8acb0c2e211b974ef775f1fa1c176d131a1e2c"; + sha512 = "6f75b318686eac3d60396ce12f082c9f756b1304ba14e58e402dab36c0e1678c871c05970c28c98b1deb39989c3fbedeb086d3d01d431a0f0451e68b2710d412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/my/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/my/firefox-61.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "67adc587a51d48b3baf4727554dceb26364f14fffae8fa8d9311bf07846b54726112951f1773149689cc9326a559d9e1a55169eb1ea4fe5be6aa590b9d0a3185"; + sha512 = "f3767211c839a1a9c19b324fd6f612b0c3a97082f0d1953dffb7691ca3b30509e21ac222d2fe64a07213cca6e5737f7f7f708a2c67739a989e3d2f29042e9f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nb-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nb-NO/firefox-61.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "79979c32e08eb9a5f9b239569f7c8cd992b1efbe6da9236e3f9365111cce74213f4ab7f95f716bdf3029c28733f0939bbd9a6eb95a9cc76285c605895062bac0"; + sha512 = "d6e309e17bc4f5b0ee0a38efda7ab3bb98f4f7a8de2dc5fe29f5692051f5f01458d7bea2f5badf5b12f145e124ca4f2ad8df43533c486b810703790cf008afe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ne-NP/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ne-NP/firefox-61.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "8cbd0ed2f0df776eae187acc8f53d1b750fd46e43780d9adf8d31dfb7116ba11021b4b31c71637205927aa751436a20f2faf7545bd1573d210a6e7ab5da24257"; + sha512 = "d980cef31c2ad665e5bb982ac10feab3ac593fa9c2c9f0dd7444e387e45633615211e095c785560bafbf4211b865d47193129b21aa491d60f8123847a68ccac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nl/firefox-61.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f0912f2e0765499baba808d340502fc463441b8b61fdc803088fae9c74cf13a27d5ce91af8b6d2fda542d560042ea3d58abedf42c7eabc4ea6536684859c6747"; + sha512 = "249091007017ceda78d9a2ee2dcfaa3d0d3b14aa1aa215c676295b139529d38d99dbcc568bd570013d97fedb8fe2d5068668a730597e84c2b25dc51b90c6dd6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/nn-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/nn-NO/firefox-61.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "995c0f9329260083030972f55fd8d9dc32441f91b647ac2a2b38dc8dba179504beefaf4726af2f73a07b0fc142e1b33589e60c67a88796ec47f101a55f015a96"; + sha512 = "0337179a7a53e756b613ef71131758462bc87e9b0b4d21b0c9e07ba5d690975c3b17c8dd620a35dc88c92e6bef9ec85865ee41b93fa4b43e88710629c13ebdbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/oc/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/oc/firefox-61.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "2d34652d6a56441ed9709ef0191bd252621b14102a7155e2b6d8cab85c4c084a6f9fa336a32991cf329b4ee3c86b3d3dd1ee23c98428170a12d4247a1d06c096"; + sha512 = "e5cab6074d88f98c5bbf77fcd1fdf5d2e6d40547ef91044b05e1e3fcc5aad8de038d787b7fcd6835277cb093ceaa7847d95efa103c7f91f00df27b7803a9a4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/or/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/or/firefox-61.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bf74dafd4428103e68b34e5ef4b92befccc2b56b7a92f0d8e0fc8deb03a916efffb62fe4e99431f5708a6fd76cd989bf603c954fef3f7a67e86b2959d2753e68"; + sha512 = "64a70c23b4ab9b1333636a692b122299d55744754af1a8c1f0b6d1ca666ef84072e06dab1cb1e078deda053354b737a09eb55c59bd0ae35592d5d6bab3b29f51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pa-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pa-IN/firefox-61.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f68daf5975093eb806325f543154e3238c3c2b30c9c4d9be4ce69710bd648212cb66be8cae7d4dc032fdb347c51f8e45634598389f1ae3be0c71d30fb470c135"; + sha512 = "7021b3bcd548e9aedee4b5e75356173a4752a7995bb4ce29a8a6201bd008ae94b3c1553f70c618d15cebb505026c899e7e8b6c00bb37337a215773b2da9ae518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pl/firefox-61.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "15374f8179f3fc589fde99deeb3ed473de8d84de22b23a1f94f396204897c65be1e32c712f778404c2eed424e87a92370a8d0c96dcfc65e41b96efece65adfb1"; + sha512 = "83d88e5a560b3a0ff895f7142204b21582279db353bce066e1995982709072ae019457e0f5cf5c6b12f5a5ce714889aec6d93846227c5cc38d1969915116e5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pt-BR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pt-BR/firefox-61.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "2d6b73fffbbe446e36b880b13b22bc1bd0a2412011492763f358ff2f8ad443fc6e2e13ef96fbcae2c6dd79da6d4ac65e94274c0bf9f12d77bb35610406571e04"; + sha512 = "21c6a36b72f592ee2d8d945825956594e96d230af244c53e89ec77fd169e01c65e4372a7b2680a45ca4678e72713e7580d17706b9b86b21223abdd1418461651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/pt-PT/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/pt-PT/firefox-61.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "60e7955064ca76af41ad750ae6026095d0b6eceef085764bc98a98767346f2ed3220d299d26929ba6f52e831475cfa1805c04ce6c111f8c18a1a72ebcb8d2ed3"; + sha512 = "c7e41676f19646e25d887c10943401625ee1322d5558ab51354b9777eba505e7dd87d4a0d2c893ccb7a91da60d456c7ed5c9058ccd73d9e82db612412541af21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/rm/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/rm/firefox-61.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8d83ad0e764694e1dad897f0505ea6ee143fd4a6aa99c44b9b33d51c624e24d1e6e217b760f487405bffad5f4626f22bf2233706c9c4579551cf8c89b06cc1a3"; + sha512 = "302aca19a36b1890747eb0044f9e5d657e20aff495c46b93df65729a5ae250aaa2ba41327812cca7ef795182e89fdf4b2256bba7ead285ab37d701fc12201498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ro/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ro/firefox-61.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1d2c5671fb18d34d9bd10efc8be7b37d7ddd30fd383f5abdb77213b3a60a6ea1d704c8dce1dc52e446e3bdf7a4e13910d52de6e378a33607fd30f39c7f05c258"; + sha512 = "3a966eae5da20ebc984c79703f0cb855267c41e3fe044bb414c6813c6e5ac2083c02578a58db93f6c7d0e223de75c075b13bf551562ccc977ad108bce824fc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ru/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ru/firefox-61.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "296e4545d7763140417e3e7811f4d6baa82656fe09fcfae6251d4499a82558b5a7d18230c317cd97fb4cf324574f21997179b4072721761f1084a358167a35e1"; + sha512 = "8856d26b29c45a72863d7861dc6d80fb8320b799bbe9a4a1dd95e19f97c5757eb913f4e2ea98f0cc37af67b3f084fad3c4060fef91afe1f34852b243484a8158"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/si/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/si/firefox-61.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7dfdfb6762002596aaa59f20e080cbf62ee91e5ce5fdd01bc13a31535c573657cbae106080b4a0e1276d45c47c28140cbd74316fa1e74b6d70a8267c405405a8"; + sha512 = "238df6400ccba0241d5cdee493949f05e51f7b2c079473d2ffe80279978b433ac365974aacd8ccfa14652db568d0acc2d9ebcc142990c8529a9e86607a3932d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sk/firefox-61.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b1900128dd080b8e90e0c2100d785c011e9a035372910964b3af28337e3280aa8f764b18897c13a2ffe19e2bd0874529b40174ba8f274f88a4d043cb8c36e5b3"; + sha512 = "ac8d6f14992af14ce7fb5c056d68f2f76397a148d596566851a2b1482fa587b357004fd29a4ad8c93c44b521a38a0afe4d7d4014b3e61441139240210c8de0cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sl/firefox-61.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "093aa2ff706482696258bb10a890a0ab72d887f020a2925463acd0990af84d831b35c3a3934ece503e53f228a2980d3529b936a6fe496040633c14c0fc0e6474"; + sha512 = "b1e2c9346a8dda2a4d36231e77af8871f9730877f9a52f22b653281416a31e50a0e3ab1b45d64f2e07b31f06d56f1f4209922bba6336f9c4b00a62c7988b6b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/son/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/son/firefox-61.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "25d73d62ffcbccd85d81791522614c176db531cfa0f6836fc57dab2ec86a3b05032e1cf7b00ac7d70408cba63c35e4e86e199cd04fe488318492c2caa37983c0"; + sha512 = "9558645ab44832c4f304a1e58e0923ae588df993a18c427cb5d613c7af12769c84ee41068aac730b51ea905722819f0a075a870cfbfe10803c671ad2f4f5c529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sq/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sq/firefox-61.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c67e29f65bdd0f9a72f0639d19b706391e4a0d56440f3692a5a8afd0dfe86ccdfcb4c326e5b54642ff3302a4b0b4a762a7f430c6371a93fe66cb727b65a5fdee"; + sha512 = "0b4c0fa3070f0f1ebf3a1da7b4bc7a5abfddd4ca25914ee1a41c23069f4869d7291e536ba4ac42dfed16e0eef489d09d20a8ef9e923aa6c0aebfb85dd48055e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sr/firefox-61.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "eae557a85e5e0b20476176af094ff982c6c60769572022fa14faf22e25f6bec666aadabc10ffa7f90aba440cd94a5c09b8e72aabb228451d3bbd1e600f89454f"; + sha512 = "8fbecf2e4d1e8c539a25b283a1526d9d431c26c764bc7aa80bcdaf800b0128097c2923127b8bc21c2039af21aa5cea376c176eb507a6eba49e3111f9dc3f0ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/sv-SE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/sv-SE/firefox-61.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b153121ff96e9e8a86498e8aa78f826817cee24f9ccd72a8ec7450add844f61a6695f8b77c8852b9f3f96da80e5942ab65dd969a28ab55c4fdd0412b136dd7bf"; + sha512 = "1b90753de839a5083657017b54d92f2c103ffc2f6fd6bd414695c2302a474ce17652c290b5440a853ebfbef4e558057de4b0fb8584ea146301aef6fe9406d264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ta/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ta/firefox-61.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e10827d43a9ddf6b6b1ea5b64d7c926ea3301f677bd2331d933e9b9802d1916302aefe64a150e153b1bd68a5550f06e3e4bbfe7897e13bc619494a7d73b983fe"; + sha512 = "2c8678367889a365193eabcdc1feb62a3f451880026cc92ac1b3fc1fa617f24478f273fe17780bc3f08241c956b264ad797fd9874c2da9867bc9f712301c2ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/te/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/te/firefox-61.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "733f5df11ce22c674b3cdd81134932e1f267931c7e1a1b363e4240c8e9e348dadab8f2728c0c55a08e43f3e1960d4949c57a674bcd7462546fa96582902cebe6"; + sha512 = "33f7e3f5fd241c1d64144c9bed3937dd0802e058cebd315251d583dde24d4ebc7744481706d9dfbb227c626c99656a2c83cd61c3b4510514be86369b43aa243f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/th/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/th/firefox-61.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2cca4fd4d3d1427f35b96d7adfffa899d1aff349f404458c00539a44506c016cdb8410ed1f759a0b8c3ad96d1b5d115ee6d2cac09a8c45ada12abda710e61e0b"; + sha512 = "21eb20dcdc9a3a1525435f6312e62acea9d23624191ddb1bf50309cc1006b89c59969bef403a3e9ba68b54cfe435b0d3c46e0775f8b21f59caeb45dcd1bc23f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/tr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/tr/firefox-61.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "cf5bfd757efb74339126a5e412c7f4c9d44c1590ea3516ca138d3044bb765d6ecb5d700ea4ba3b1f1035f798d1eee29e14c1e71ba0be17da15edcce307740fba"; + sha512 = "9ef5a65aeb0ec9ac74eeb0bdb9c44702bfc111ac983b79ffc774366a38cf1579bf0ae34e20cfa2abddb6105e4d426c3fbcc9eb1575ca74fe3863877634df29e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/uk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/uk/firefox-61.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "54b532c38324fb4d8140a48305397aba97cfcf7d4cca9835046c6cafe2da1a206de82dbc0c3c7caec7f37e4363422443d39c6dec5633db9039f2bc04aa456bfa"; + sha512 = "47cb53aa15be19e325305b5d953d97839afcc92ee2ac53893dc44a91decf15cfe81f11594aa60346a3879734895425a22a7e0600b392b9b57364c58f769aa55b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/ur/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/ur/firefox-61.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "02e14dfc408e70cb22fef6fffaac8c88d38d305de04c882e9ecb0f1f25c272ce7d9bee77b8c988cfefe2b52a3a6ff592638c327810a1aa3b70b1865fa94e522e"; + sha512 = "02ac956c4894129befd3e8e9105e93d94552e9c9b22215bedd2e8f3ffe786ce499b426ff0c5d0c95daf38c03df6ecb0ced4a5f09a62ffdfb2301eeb68bdf0400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/uz/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/uz/firefox-61.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "0e2d467f53c3276ce96e974e22681981392437741b72cdc11b486f28896c95f1f86d48a6661803d6143d160656e0b566f2304b25ebac587cd657749022193353"; + sha512 = "30d150c4e8304fa4dea1776b5aa738053a3d9c67f6fc2e0342ff186b802f6bc90113b14e5646598a64ae0884f615b41ff7761bacf066db7813391ed5bd51eed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/vi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/vi/firefox-61.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5bd6d080d82d897ae2b48a636143ea7f502f473b6738180a51207dabf57fb9e440aca16f13d1c190aa623adfed3ec61d5839f918ddf43be83b6989d10ddaa418"; + sha512 = "8d8649718bcc413e7b6ce64960127b7a101fd715b8a682c328ffddae93056a697f855551e1a6955927299df91a577d0bf20400b3ba99546f4160daa6ab9b303e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/xh/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/xh/firefox-61.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9865055d2f4f841ac84acdbe7c3d839e245599511f075292825e3076ec01ac28b7863c3ba90802fec98a940dc8bd892d9d77cc420e4257cf0885f1020f70d89a"; + sha512 = "9ea7022d4651ea8dba8ce8f8a7e364dc9f98f7a04c99549d360d4626910a30dd241284d5200ac021e8a52505b4db9787d21a64cd1c9590938fbd08d2273a95b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/zh-CN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/zh-CN/firefox-61.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "85a313bfa3faba33f25fe469a59c3f4eb21ffc5f1de524ef4db0e6fa4ca7e9d22dc359592646ceeefb11fdb50649fbe9fb852c2f9afc7ee1ff2d971f2f587313"; + sha512 = "2b87767733ce162cfd4ca5967e51eb77b5424add8d4e1dae55a874b7f5b622ecb3edf4a0d97632bae197b425d0e49eb97f491c09b4a366a370d3f451ddb8cb2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-x86_64/zh-TW/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/zh-TW/firefox-61.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "361b5b6680819e9c34e35921e95676dbb91d461d24c8d046b5369ff31796ea5d713de08114b2e34b0c06ae6f182c042bd51c58eaf7dbfbeeb26f5a0e12ab0d39"; + sha512 = "7bfe215523e9967b85bdd278bc55986b9be9ec9ef9ca2050e08e105bb0e880999e43877e1ba903438517d86123686985e7d528c80d2500d32162b8c996b86128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ach/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ach/firefox-61.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "47795903b41b7580991c0a5bdc51c9e6675955d4831cd15a75a97853eaf428bfe111f9c4268433564884583e5251510e5cad14e09d7be009791a03a0dcbef8ba"; + sha512 = "b55f452c559280bfdd4a2a0b8c36c83a52d69bd890a1f2fcdd4b2c6ce88ba4ba230bb17019a8c343a10a3fa0ff258653c6f8bf7ec9650c1ad39af95b2a06f0c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/af/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/af/firefox-61.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1a833d81c580e26a337f7471bdc4df4bf2f4966705e18c09cc07d4da54208bf94f77b2a0abdb6b81f1e175acb902cb61317aed313af9e374f2b2e6c57e4c1f2f"; + sha512 = "1048fac8c053eb535bda40b971a2523a2c5cc26bea10b318e5f7957dba4df0563d894f300e95649b42e142031a8b1d93d8557038db999ec349e5757ae33b3a56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/an/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/an/firefox-61.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "72be8c1502c3e5c610d3e09d557ddae5dc74a9d16b8b6a2458f2cfb3e1e1d04e86404e53427a0ec9de37f7fb35a3a1e12a8f308ea80c527c7203e111710cfc09"; + sha512 = "e536f03f3cfc2301e65d01c820daed33fb86bd788f929ccc3c2227a9e824b421fb73aece207aeb43234514a0220f2797346b5d3d5d9c097b0935d3febca3728d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ar/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ar/firefox-61.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6b332c3933b875cbbb93f337470b51f59d8039c0d15028e3f3f9da87c5d540ba6df194d704deb9e3caa5b31fca9d9f35e75d2fde94d56890c542055133341285"; + sha512 = "19a74e97b365e6d29f10676dc677a14c206dc36f16fcb24c3202def09158b29eabed0f0dce97951db427d9b590e5836006ce0e84a7a897669bd0f8912a84fac1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/as/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/as/firefox-61.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "65f3267e3d3d1abd89db670027ebfbf8daa73b3ae29d80ebab904bdec746d2934221ad8f8c20867671ea709252b69287399f2560fc8f08f78c0693f288daec20"; + sha512 = "c1f85672c207cd9daa53309d47388fd53b22d4c6fa38a10b18cb7e3843befb23f2bd76f8754b15c4486ee4c71243e51ecc0d1baddb4ed956a736cf0226b774b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ast/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ast/firefox-61.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c242edbe7b54803085e9ebc8194bbcf0679905dc0546944a02dfd1bfd8c3dcfa455111b433bda497dc901f4916d34164e1645bb07a2b60c5b36721d7592a374f"; + sha512 = "545aad447cb458a55d2f0d7930303ec5f1f82ff5a48350e8a78090fb4549f376ddd4eaf241d76efe4422de95e1f23110cfd6ec44f15baf769213f2eff3121089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/az/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/az/firefox-61.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a1a8639450e2c15348bbfdc26d8f2625231a3002465e44fe8a4027f1f5d0518e5b1f46a3d37ec9e091628d7222cc447b7b6017680c39922adc2e0bd3e89b1d84"; + sha512 = "24d7eda6f2e688181c5740913232a340675a463f3efcb5382201c0415ae2b98b67f15ec5a00e0b724f6aa8ef278a64373a2f9e5a7c51f9b9a1207796da0f1fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/be/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/be/firefox-61.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4aded5865bb90684fe5e6b4e99176865449181b07001d8af83225231f89efe25f6c0a13bc15bab54e746c822c44e0bf4a8d21e667a944f7f42348b015a9ccd8c"; + sha512 = "3e6f4c16359e6456b11e9fee4f9380dc02080aded96b3a578a157893d54900a5d48525037fcc49b8ade8c9f8d9210a8f434505d91e3f319323ec1f4cf68e6045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bg/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bg/firefox-61.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b044c84cd726a5955f9436599102af13f30f637505bf1ed309213ba37c887f1d06bdb902a37a415f73d98c126b41661fbf4ee17c5a3c5dc1e7ce4a24b40f61e1"; + sha512 = "4147ea78056b274952b6f8a13f5564421693b05b416d4d70d55d1143c68b0f7c3d025b5ca90690c19d6cb31f1e55af6e428c3c704f4d98c541b77c04434178c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bn-BD/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bn-BD/firefox-61.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "efe45227912af62be3f34fb24ed8d5a428c5ac90ec08e88e5469ceb3a812994c56ff8cafc3095256123adb9c9ec48b397de8ba13cc026ed7e33b0c8cc73e40f0"; + sha512 = "19bd3b44b02fe2e5ec37529ad2b40b84f251ad379a60e8164c225cf79b4f8efbd4bbac924ef61403ccb2539a72ecbfe2236a373a027e95f55e70cc9922d089bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bn-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bn-IN/firefox-61.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "2e19b119cab38130823555d66178a4cbadb74d91e45206529d151b289557916f9bcceb267990b00c116810d1ca8bf8d7de69bfb27bc71e829a61dc314d8e80cf"; + sha512 = "7774e9dcb85cdc4f91b9ccce87057884ecb982c7c934e579a13657666e86c2e997c64d1d8a61d6c44347af270e28568490f2624841b7fb6bcbd9e08cf637cac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/br/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/br/firefox-61.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "953922e625bad5f64471b87ba8eb646d3db6790594cf79ff0cbeda6a5bf88ec93ea793599704c6dc4e08d433c2aee4930ae345a002e015183c19d0d0c9261b9e"; + sha512 = "9639a3a13b1fc7cbb7625c17efd7eb6c2f8c12423eb293fb83039203f3f6918c54213f0c73bde33d4e439ed46f8f6d3c049e6bba13498bbac17e3df122885d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/bs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/bs/firefox-61.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "84b0cdef75a3043de34851d74a2e8cb5229bc2d6482beae51917ae4122231cac9e9e7756009654adb47eee673cd2aae251f836a66067eaa08cc2853275517fea"; + sha512 = "286390d67836cbacb06db4541b6283db7d2fe7b430afae8a46a7aa45e3dd366049af34b67eb35889c2baf875c39671240009883e68ab511b66971eb81df337ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ca/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ca/firefox-61.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9e1f5d10e6d73576c634b749e90e7d787dd0d74d1260a9dcf24b9744d08f89174ce4f5240f8347e4b8d6fba74a8a7b48b2acf98269636830d04d345046c5aa4a"; + sha512 = "a1695ea94759b0d998216b4b28d27669656279fb1e42eea46b9b6008964e5dc384547d9c3b6e85f5ebbf2051b3536d0a98c042cbc8d648265a8047666bcc7f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cak/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cak/firefox-61.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fc7d14aba77866645e56b8f1407a9aa8eb129bb4243ebefbb69c131a2b8f8c6f2ba5d12c82af0f44a0f24f2d25ea68c5e6418e5691629cca02f65e0d481b3711"; + sha512 = "c00086b8c3fc4344d53c5abe1ec3226fe897b853d75dbf8b1aa735efee368507665fd5c4f4d5f1e4a29daef3b02d11910b3e1cee948fcb22386c90e3df8221dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cs/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cs/firefox-61.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8998b61aaffece4ac65475d97f1d2ee1427b5e9162368d5aaa2ce1c1fb44ba1e306251aa256b8e3b6561dbc07ba1861f33d99a272f0eecd58a9c382be7d19088"; + sha512 = "55cd108a1a64a31eb4ed6cf5f57644563fcf318674ea9c179ea29e05ab5cb6ba9e021fa2af2a4a6d3fd447a2540cea3d096eb2b5f004b79c40948c82cee369a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/cy/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/cy/firefox-61.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2f4c2ed89e5d5a916002712854f0ced27ae19c99ab7167ea3e6b03283b587899d80092e0de853e890fdb16f61f3a51f89565d65ed7d59486d34fd80e1141c062"; + sha512 = "3364ab70285b4c48f61c05b98e0702afc2c58318f63ba40fe32247eeab7737d1978eeaa99128254adeea2af855917e40e5212724372b3a095cefecb142fe6a5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/da/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/da/firefox-61.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6c878c5e1f4dfa4e513703ab31ab56192cfc6634bb13118826b1db3d5848b512cecf988ec1e9aa7a43d5530325f4ca3cd2af908491b3143d646f0f559c231c02"; + sha512 = "c97fcf7c6d278c8de051962cf35c2b63bc106488655de5dfc4ded6b17e80bde1cd51dfbe3922e6a3cb1af331cc2a442c17d19d340d58a7a5459c85df47b27a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/de/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/de/firefox-61.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8b3720e6c9e8b096785763aea4657cfbe7f8ba3e3bf245a66ea5d50d4c6150a2c3985303306fd3899b19f9296297adedae834bfc295141c7282ad5671cde96da"; + sha512 = "a5f05018d94248740368575939847f8935a8a6e95ed5958747fd8e7ecad1cf54a83494f234aab8adb23cdcf08a118c1cdded3491a52784deeff31fdaf46eb60d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/dsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/dsb/firefox-61.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "4cd36f313fc95288cf3b691f8dc1db891c80c0fd61359d208f9d2734c67586e9b2001fa167a37804ef96bab35318f78415596a7b43c42c9c77ab08e76c45f36c"; + sha512 = "b28049cfb85884a22cc9e9c73f1673cacb6e057ee74d9095c42d44b9215da4323f724850edd8c49cb1ee76bc90a5b741bc21d6310790b866ffd5caedfc3e5eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/el/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/el/firefox-61.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "193402a98b08cefce18d412ac0d0f950307a4ee58f00e9b4e685b82b8bdfdcf14e3ac6dc5d9cb2a2afdb81221ce1b2c5ddcaa2df90eeb6412ef13afc1db702b8"; + sha512 = "fae6e42a0ccf05a35333810085d7100874bad3d09574a16214ec8ea408db5232d77431411db27d261a35463a5b21e102a18f34b1f872262e891db3471c5b6240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-GB/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-GB/firefox-61.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "861405ba50462d0b4535ebeb053af0c999c1c5bc525ed57bbb2172334bce4b315b0abeef92adc8cd0cd92ca16ab527500f7fb5027656d8b14f6f682733ab257b"; + sha512 = "07debc36dbfc6ab656f023eebf91d53184d7bc0a8d0bc2d2986214ff2d305bfb2338ad90bf7f5be4c18f667f06eefc2457cdd9eba17c3289a2c6e4a6f571890f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-US/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-US/firefox-61.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0838d4a6fa9151992e84227a06e40793ce832cc78761ecdc4b5a6ca2d73aa3bc63ff89f50d56a0ead39f53f2586ca9e889f251b6e18dec814e351bf2e10a80f1"; + sha512 = "e9c3c173fc5321e728eff82ede9bd6e216b08cf56a053c2634c2c17e24f0469d04a48d58657d5685256befee4b0d46ca395a1d651f2d81b5068c229fd2354cb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/en-ZA/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/en-ZA/firefox-61.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "574336acbba05e99120e7ad89bb3c756273a87dc713992ac25c2e2c82cb0e6c3fda0db5224f595ef1ad34e27e3777842bc92cb5c50a763585d75e8f03dfd9c28"; + sha512 = "12c766fac7a9837737d326cdeeafcbfe3adbdee5b26785654784cdc18afc513b03ef8974cca992892e524d134711707f676326a56a1188c8c7de7e8e042b8e8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/eo/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/eo/firefox-61.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b47678bbefc275cb8e45f779691c2c0b3854bb585818f1c682011cc6519db65f130e5e525e6a03682dec25025fbd2b55d54981ea3bdacc877ecdd084aea4563e"; + sha512 = "8c22fddac2e1337e2cb3b237938534290ef0196480673655388445a8757c7f13bbc2a9e9f75496c8c8d4a92f19e1024c32e466fab39334126cffafe93fa00bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-AR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-AR/firefox-61.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ec3fe28cd5ab8a3e89ef41dc69dcc43299205fcd7b40f00aaa8abe14f1640967ae17cf9ae1532aab98026b0dc95ba252091a605509a6d2c589fab89a0568c746"; + sha512 = "37f125a048051f1a01e6d027e28f1f5e08e1dae5146e5f1421ca5a5f84e482fad634ff554f40447013a4ac70dbd5a9b059e36c8f33ccaa832197ee4da1d0c713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-CL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-CL/firefox-61.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "800bc8202782eece7dc580e25a8b4927c1d25afc229ab4dcadf17ef22a6f4a7364faae6b94e6f42c6c64c8e4ce6b7002d6d7fdcb24d26a66c7d01dfeb792b0af"; + sha512 = "832e69fe756963ae72f7f8aa65a980d5cf0d5319ec3bae4db54cad4f4ec15624bd8b6b2ae6a07ef18d62e3ad2d9476e0acc4ea9bcc25cb4ff0d571029b5d8b6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-ES/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-ES/firefox-61.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8f12e56ee683e437929d0d8332addfc302351eb5af1aee86ee7c99552145f58f7a2657b1c5ba855150793099ee15aa1c2d64b3b9dc43dc94ed2ea63405da20df"; + sha512 = "7e57cd5e46f6100421bbfb411fc45e9d2e020f0ec79489983ada935f5f942b9acfcd691324627300e3d43f42967520cf0776a34555e924d9a02e7b50eee1baa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/es-MX/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/es-MX/firefox-61.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ad8baab24975aad8179e2352fd41ba6833d66bd4898c3cda4399952275ab64ba55733997a1d4d3d27e409a41771da224661bd771f07b0f628f7779a437fddb0b"; + sha512 = "da380a51b5576e8fe3c151fc1ac540bcd89b5707d249d9b243f1a131eeea5f1ff6cb6fad0529ff4c5081568cfc599dc55a8ad65ca0b703026c3668035360c1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/et/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/et/firefox-61.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ce6edb6e5995308f129683e66fe6ac8b13c8aa53de6b04e4890e462f046b1bc8c143553d6673464f8a06fddd4c8087ce150d2b3944b34042160ae1f88546130e"; + sha512 = "59bd6a5f13805ef3ccfb4d2cdbdd621396f92230ba42194e68204433810eb833237c1fcc9de15cd5ed24e603dbee507c9859752a757a5dfb297cf81d10cdb301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/eu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/eu/firefox-61.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ab1909d7b4b98e45540c8020b098e83a368991fb29321fbb0529bdb2e7f5f3dd3f77f2959be0b337ea321a235cd5196f9b11eaf552f958bc11cb7ad5178f9c44"; + sha512 = "f8bb906499e04d07c928e54d87e8214e8722ded45da26e3405a8b142b0c741f4c8747bab56d569efb639cab2fd70b2abbaf9535540b21dd04aaed0ed6b54053f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fa/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fa/firefox-61.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5f638eb2d1724d09a4aab1e2498dc4d9f0d4dcb5233a7b18f2d55b35a4177d6b24a8531d951384b220399fc4ff21a784dbb81f15e631d4842cf38a80038fe4bb"; + sha512 = "34ac128479b5a4954b9bf5b2e7fbb0e3ec2de1f6c406552b79451ebd91bae81c9cc2f0e54d49c95a2700e8a41030b8bb83b87026b95460363dd41fb749c85e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ff/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ff/firefox-61.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cdf22582e20445050c345d52c9f5775c0a24bad1d58695ba17393aff540a1228d62edc0bbe7dbca92b2e5e973369b660154ba87c56864df06f327e989af6838c"; + sha512 = "555c84d4285c407b181a93253fcad60de4b81027587a5459324084fabc9d64f12aeba5cf351eb24b8b58b3af952968885b11c9149afcd4751998eba67658ed2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fi/firefox-61.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "81d32de0d3e685b0591609211a99d955d1621797126f67a8da0a97ea8592f10156bb734fb04b1f69e6463734cfa95a3203e8bfd9c872c769315069a37ae99fd5"; + sha512 = "4fbb79c547596aa161b1fd7a50720b33076339044441494fd0abf3558e6463415ebd3e95abaa45f719c2d285f56f1b765d0505df634333e0c2fd672dcbf999c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fr/firefox-61.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "0fb48cb32013307a3c4b7d5b8c55ccfb7aac43461b59ac477972008548298d10e38716cc90ee8f7acd65f0b1e3338ebc4cabb5cd6deac7b10a48627fd3ea1040"; + sha512 = "64d436bc82d271cba04f66d827ca15aeec3073f6aaab78173f947ea0a07d199edaac33218b7238b4fc655b311b3009d104eba4fb52cca676d4c54d2ddcd1c90a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/fy-NL/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/fy-NL/firefox-61.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "a21caa506e164a3f94938d619474357ec1de4ed7cdd8b4c67ee19393145d505edee38bf1bdbd16e051fe38b93ee0bbfedf6c7d05d98b8cc9b3b7672d9b158f5e"; + sha512 = "9ef9fcee6cb1d043886d8ffba36e196e4f0c223c5f59002ff2f4ac01d01ad87132d2b07c7608a75907dd8d189c44ddfca236a505d7b9c152a03ba4b7400e8c7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ga-IE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ga-IE/firefox-61.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "28691393cfd33fce28c50746b2c28b7774997fe081a99ccc72009145d0de8cf9d96ac51964ec0771cbe80084a28c793e8c0d82000b3d9d6cb49fddca68f669ee"; + sha512 = "ecd79f7b47d6bf21fbfec408f3d6460b3fc34347566c2d595ede4c17e775a4c0211db8f74cf8436222e23f08145ec58146a5ffeff22b579f9cd2eb771861bd0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gd/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gd/firefox-61.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2d9c360ef849818d9e7e971cd091fa02ba594b287a7d8ba15dc08868577bc64bcc8ce9d74be4e0f3a8114aef8e7beff4d4382ffb2df8958512f87dc5de9d1ebb"; + sha512 = "6396eb98645e81684a588e9c34e29687571bdfba34bffc162268b3664d69d523c7fe7b69d35b47d0c86aa869350be27dc6085b727df58f7b570a9fa529103f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gl/firefox-61.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5de56badcbd8f57fe3ae322445bb48684b684d1d714aa5a6225ae512677f10ff91146d1b3a947f31c49247fa47563b14497cef956d4a0cc852f7753d7ea71a39"; + sha512 = "5caa6d474245da2eabb8799503faad658b1a130a95b11fedd1f54c3cf7b6d9999ba1d803524650c59465a786a2fb1e216a0ee98547779def53ed89aad2da01fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gn/firefox-61.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d7221acd23f9371c6e802af6f8ac4c90933b58a24183247274251aaed5bd6dfe393205c07618b59b765c2988762978522bb03178fc7868eaf9eb0cb34b6456fb"; + sha512 = "445cbd58627db87fe0dc2fce58aced67f89ed3edc4aa93ed35e060a9ce3b7ae82d22fa2ebcbb79835771344debca460c7ec7079e43e7e998f4c895daf1f3935c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/gu-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/gu-IN/firefox-61.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "79c9501dc94fd32642862a5dff4c8bacbb450b29bc85ce6f072e65ec369ce43714aecb1f847b24335970fb0b9c9d27646b353c2bcdfe2a537df3b461c79c2d53"; + sha512 = "44883c3740ab0ab410d69478209b47e1c03191ee877df05d43647ffa8c5475b7ddf6a34892f6f029b336d7c4ac32a9423b3f88bd5375654a334d3d535759bd79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/he/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/he/firefox-61.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6dd09c5cd1767726cc4112e499163d868f472fd93902d3d0079ed5e82598c94242944bc9451f5c6c8bce0d5c338870300052e10595c7c1614c1f239ef9f8d419"; + sha512 = "cfe2db71c2a042ea48c4901d61d2aa1b2d14609a3faefe803aede20eaf47339c64fca90234d3f13a888430a049f65c55a20b8fbd19d6581183a82e3f91b5c1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hi-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hi-IN/firefox-61.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0ca10d1d30ffeb595dc8182fe29b26c554b9daf8d24ee294fa9a08cd326c1dbdb3c90a12b10aefb973da9f44e9056ab49b25fec11eaa81ffb6639c71be50b16c"; + sha512 = "31f04c96b1cb36b6ce37135aec21ddf412ec952743f387a0ef6e7b5e3392aa81983dfc67123648b234bb90fd3934e056868b494b85e8281c98051c899c5667e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hr/firefox-61.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3ec45a85761e7c6b0805d0ea8769ab2a6793214a910cb808ee5ef0f7024ad7820607c0d2daa005628318abed609c445fc795b876a8d9bd2ea6cc15e386220805"; + sha512 = "e4f638e7d59ec7a4e6200c055c0a5361e46fc42abe586a4c3888dcb2bab5cc6b69f72feebd2e0660401b17cf3ae83c80216e91b5d81b39b35da04f8d4c03f105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hsb/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hsb/firefox-61.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "25594b1b0f7db9650f8f14174b686bf753a52f9a0f8065ed57d180bfc77d3bff3cc5d5d6ca80ed68544302e7ba57c46decdb375bca0231f7ada63796bb1c076b"; + sha512 = "fdfeda959afac64305c1303d4e1dc978698beba6430e9393be06d1fa245eedf15a2e6f90a25413f056f2465720793196f09223ea120ca297ab96da0cd857f93a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hu/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hu/firefox-61.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "c1e28b2ffd1141cfe9f10dea4067afd7785f3b5ac2a0ce0f0cfc53aa6d202f829365c14815d97d65c77b4e22d0caa358c541f9ae8c36764087a3a7db22d03a4a"; + sha512 = "b7706bd5727beaa73b4b4198f810aac05ce66ebdf00246616c7a8530e6ec33efeea643d3053787501016d0aa1833317381f6c378e6deaf72833dfab450f78472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/hy-AM/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/hy-AM/firefox-61.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "70bfe9318fc3bc993f8ec8949db3bc1b58a20c8f6850da35a2c99076b5770c4edf54f8e527337558dc8f01a3c9725c6c2706159f570a9968f26bf2eb9b5d8318"; + sha512 = "1e3c07231bce9ee33f1341e9687607499f12af11e3145446f0955cec8d4b64186826fb53a34d9d0177b7112d748a1faefb30020e010c6a25e00d43e96e5b6607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ia/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ia/firefox-61.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3e7b3920911f48fb0a81921a41dd7c62b0c65b94e5b21e4c5e6df96d0061d328649459183abd0d4c927764b86797ae64d65020d7f2db620007d7e16e235771bb"; + sha512 = "fe0e909ec0f9a62b907fa09ddf26e3cfeefbe5c666b94b96f6d9c355e8e343bd067a3d2c731567a09d3225618ee661c03969e97aa47fe0cf83b5811de0b562fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/id/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/id/firefox-61.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ccf32223bdf491481688a38e1532c42885525db9a727722f6a0a203dccfc3d3e77a010a1d5d34dbf30d2c30f74aef894268d4945b7a12293b79447b542477e16"; + sha512 = "b2a48287863a6e4d21e33d1c5a55fc3ebdcb999bf6ba10a1316f452cbec2d8e19b09a53dda9421fde294816d6eafd8c51201088672dda28e3552e9b16aa9ac66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/is/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/is/firefox-61.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "15579492f3b431b6871cecef270888273b9bb54eb59975379fc2d9af1310b26dbf0fd198bd0a83e2e3df068a908828f0c9e35d27a53c3a91b946140d8b43b63a"; + sha512 = "a10ea717a13380b248ace95ceb70e9204b163da87edacc944e349028899387cc627485af2ed3f755d2b01458cdb0935dc98f61ef523f6949579ff9b425f8711f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/it/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/it/firefox-61.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a9cfd0c8d01a068a83ae1c5b8068aa88dfbeffe343cf6ffb80ac4a5ebd70304fb4123303f16f57dff3988abd558f182aa67185283c49e7e281d4da13862a4bd0"; + sha512 = "fa2e38fe6b52b5e86430ab2aee2e060c2055711897946c43b9b4bf59cdb1b35c8e44a0bdaf6015a6ed77511cf20eead5a84d474d54881c6a1750a87d485acefe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ja/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ja/firefox-61.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6869eb392e8121c97142179073d2b119d8bfb3a596a143b0657ad8c4f93f766e08c1f4f248b5e501eb7ca071eb32ff49ac1450d7ac81e106c6529bf56d531e91"; + sha512 = "2bf34410b84ae51f203753433c4897807940b08dd8c3a9318255055e948ac63dab63573acb2564a71de965a30d7fd652b5812afe9f1f2f59a2f20c0b8e233d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ka/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ka/firefox-61.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f364df168243ddbb311b109ede41fb62b047d1048b16211155183fe0b3f1921d2b069e6194e0734fc0f24835831ecefd4986634d3c11e4da362ecab10f63114a"; + sha512 = "598f36e8030e97354d196eb55e475977b71097b320d320595e3b2eda4f08760da5b517d4caa96df6971ca0dbcbff7e2565fe1b9f431d30dea37641fc3064106c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kab/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kab/firefox-61.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "866ea971d180d0f2b9dca2bae7c8a83f9f1e455ab28f05b47d4586c3cc4d5476a8fd83409cdc3b609b2377b2d98d23ec1345dee4c560125c69338986a95897f0"; + sha512 = "43c56e804aaab89e12b357f04fc6f41e5346f8759e2d541c0381c4a54f978e4175827148f756ab71d72e03b4d0218e55ede6c0b8c6a315a7b8482f0dacd68575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kk/firefox-61.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "9e846ef6bdfbdb4b28ca4cbf0134441642a18f017a8fc517c20079558c0d114bd91978e48d087c591e748ccfca8aafa7d0c4e636e668c94bdb30e88521800ae7"; + sha512 = "5eed91145d14a0294199419f8e1fcaaaabb111d24ac83ef8813425565be50a27211c012311925e521e46a5e4ae65048bb9362786437232d9a34dbf758dc97232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/km/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/km/firefox-61.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ca93997adbce2a9668e4330a26769e01d683b6a41c43dd987d296d824785fb5346c16405506dd026ee00563029d9a48417aa160f9acb8c72e941c5aca33aa487"; + sha512 = "9e62e485fbd255e2c7020fd86297350f6118111e44b01430377b685040e966e019035ddc848013c20c7b0dfe7650fdec8837d3315723d85a631476049297c435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/kn/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/kn/firefox-61.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "591edfcd032e824266fb0424be8a78bd28c70f54db3ba80e33dc1f457e478c42ac8c0f3567ce8a0555e26300e00a34bc74799151fa0b7db75ca1c663a9d42663"; + sha512 = "a9f743f7dea565a2db242119cfb949adb15d4d15c255286cf233b017b6a07ac6392fffabb14036891d95561d889a69ef6653246ff9db786eacbc388485f662ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ko/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ko/firefox-61.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bfa982f8c26ce1e250d161a4b551af9a9caf24a9161369e98ee5008e00caa593b75375672b5e6a20c3e53dade495b19760464946307985548faa23849adc3231"; + sha512 = "cec6994457dae483feb64988472b8350e879b6b4a779c90aabd995b45c80a7c94907f626e8129718341ea8bbed6d0d2944a7a5a0e13ec761c2f7546b17df7af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lij/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lij/firefox-61.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9bcd9838cb300fe9d9022506ba33a69fcbb56faab21aab9772b203d93cf5e675cdd243b3359971ee9bf4b005144af46429a87e14024486d34d4c40d93b9d1f90"; + sha512 = "25121a21334bb480863e05a9077819461e2838b3fd27037a898a84edb23301f763cf8f63366bd74028d762ff113c1e07d979f5b2264cb1dcb09838d8189fd010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lt/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lt/firefox-61.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "bb29197b64fb02099e78e3e1a4ebafbffb6c3f5e8993abbe955988388cfdd1a9b2aaf85380c01e27e73d4ac304ed983186b961c30dff3742562e0bf16b5d3782"; + sha512 = "fd7054de958d020db5a4b1544a9a1b10bd9a8967fd46a33a7dfa83558d427f74d0d7ae583b9e6fe955fbddbeac0caf392e2d64d4f0b73604e25a98355c18bcfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/lv/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/lv/firefox-61.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "8abadf90fe91dc5b28a883b06f7baa672479a3068b0113c6852ca6bce73c7df93857d0499481717cf3ca67ce42c8386797c6f119da1e9f7922e1bd51010edd98"; + sha512 = "5e05821560b53fb398ac2bbdc40f917782e0df144662d938043cf07224ebea326c3cf9777178caa18b9f4a25419f773cefecef2285cbd86c05ad07025005dc4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mai/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mai/firefox-61.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "11221d95a3295d260d98308b7107fecb5cff9d2a183d47834eaaef54cd0798f792ffb266d3c5bd6b636a9d4010713239222053027edc3c667aa6a66c687d7b9f"; + sha512 = "eaf5ee6af04a945192081dea1cb7ae6dee5edae8ae6970196e2ed5c2defd5a0c78da90996f9a02e0d6f32911135153191c61aa3b8366cc4e859f6aacf31f333a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mk/firefox-61.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c22a6866443a6414690e822991551fd5b6324bb8f46e79f10dcca7ff782ac78e620c4010d0ce9f58d622b84ceffeba39304cdc6fbfadd4587602bd7ffff07cae"; + sha512 = "07e87f94b52a8a025035a821a07d2df40ba13b5cd8fbaf819876a25726e7f9f760eb7b12434df55de7669b65d1d8c14ab9d92112a4136d60b6607fc003dcea30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ml/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ml/firefox-61.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c8c1b1d59e086a72604a1c0e29e3e461400d30df32c1ea25a9ab93b4399ee81171c6d69909d81aaae7ecf035e97fed9c01f0f70076472b1a575d73bf0549c095"; + sha512 = "2656b70d128ba1c1ce447988bd413a624ce77f95b0eae29b5396efe2ce3f28409271a3f1b7680eb4216b5007cd59d6a3daff4aae7ef2a318afb9ce4281ed2e51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/mr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/mr/firefox-61.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c5c27cf8ca4d17787d8a04d3d8717be10f6e9dc34c3a21e8735964feca4a1691a0121969cb2cac390a26c7c0b2d2f92ee30178cb2ab8e78a680d0538ce2bfff7"; + sha512 = "6ecfd0bf6efcbc9f58ea8e90b1e32199abd63033fbf588a0017e699133813d9c4b8acd33c52e287c554e0e503adef52e5ded7e20a5f0cb15b63518b765367731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ms/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ms/firefox-61.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "32ab67c932acf0b590208073ff979cfe106bd145dfb8587bdd1a05346f72d3bb1145d89ec15c896c5b778af1de347408b78ca2db7aa97874f09e4d9df380cf77"; + sha512 = "85c696e7f2cd2df1805a0277e660338b0b05ae46646541322db306bf62d9707c7f3435714cb5a489a06f5c026b75d6c585900e680f5ca7598b48d5ddfe3063c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/my/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/my/firefox-61.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "464b6c86338813edad14e475e98d4c949d4ace87466993095fde6555c17d518e3a29e933912ab46170336803d21739dd606d29e33ffd4935c8442f8e2ce805ca"; + sha512 = "35f627848e9bbd54f644ac823480d454e3728849d408a9b8a594af768d44d6014d3b8b68ed93106674fa8ac7c6f106a36df4128fbf3b5f959d10f5440cd34575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nb-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nb-NO/firefox-61.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "67161cfeb83ecad1711c3debff0bda66a6dff009b41f3f54553db7fe1b7300f938db6943bab64a8cca1da43f1802da6744969fc2f69132039e76bfedc8121850"; + sha512 = "d61ffe332b396f639155694d1eb88bf467dbfae2f2ba776aade52c983ea0226371f3555cd5d4c63becb499e5c7e48dae9a864d00d17951a6caab0c65462759dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ne-NP/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ne-NP/firefox-61.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "402aadebb20816fc03418a2be1c48b2e4deac3405b0ad12e9c59ddeeaf9c2fc7140d904bd88670ffc7fbf736ed00b762f963a5c640f42fe1fb7333c51928dcea"; + sha512 = "93287f46f6f0c2ddf1385197b36246f41af757c5857e27a8d7a1efdb7dd15d4b6a139c24aefd52aea2c7593175e512466887caf9388990046683a1976e017856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nl/firefox-61.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "54bb6529777cfc9767120ccbf1ce9664184a86b4701fb101a8e3de6fa3dba3bd8b72459f703ae40fd4d4bd10e031d98d1e15f9e35c05bf60af4434b41e9545d8"; + sha512 = "69f1ed3ede79de978e2b2c73482105dbff59963587ca12e56a832f652888f4527b4cbdd1ced9c85f128fcef3efb5c345875796e8ae8324520f9ac3411767ff5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/nn-NO/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/nn-NO/firefox-61.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a5dd42fade8f41331c3ad9c2bcc32285da8395f0d3e86f503fcb260b37d1e626971aa34652e0b560b80efbaef18c40a735ba4bdecf1d5ad949c9d18661023daf"; + sha512 = "c8db50dbf58b1384a7a826664046f3338b013bc7456d597f99c04ec8b2664e624ec8a0e1c7fb99eb905e7068d69cbff3cb34713c17b25a4b8dd5de0f66fc194d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/oc/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/oc/firefox-61.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "46ab7215df1645d03a690011762be1a476b04a1f4f5d3e547f2f4d48c6f64ba38444b83be943b8f8fef62f84dbcd98115c36980150cbf83d86225226040cb5b7"; + sha512 = "7562a6df9db11cac7a69042b2b22bb770ccf61d4796c0c47892bb66ef41bf04c48ea87afa2cc4e5210ebf0ad1383a8c901d487434b50ab6f6177b7b561921983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/or/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/or/firefox-61.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "91ca8c4b451a2d6bd75dfc5b530e7ccb790bc91c3d04f0da6993fa16ff5c8a5f8b8a74f7876b08131df44221f024aa08d58b4579f67e8d12e0d5be20883fbc06"; + sha512 = "58021fadbf4732639fde5f9503dbf93fc60052bd0de5a9d49a8831afa3b67518ed6c50d1508778f9f5297b3c0587081ba4c2c88dd74c6004fce85a48d7b13eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pa-IN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pa-IN/firefox-61.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f85da93963692bff4f17edd06246bd3ede76c7f66086966e90765b349e98f82ed1f658cad95ce1248fa9bc729b9b8b7df86bdc048ef0eee3fd273681b6f40e62"; + sha512 = "4a37afef80ccb50c20191b6a780e435df21453886abde2a0895159b3e54a3b415741167b5afb6842cea629bfd28139fecd2e6fcdbd711038719b1fcf9692fa9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pl/firefox-61.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "00515cef6d86aea1c4c4c431928b0eaace34896c737f9e806a0f6afd6d5dc710fe021da689ed9db6032aea67d6a7221dc4d7e77050cf8a43981b685fbefe36f4"; + sha512 = "115c886f16e2b179bba110e4b21fdc0822d78441d0a481d402d8eee3aa6735756d18b24c036dbe3ff7535f796903bd1fb063db4bf7fe9c92dcd7292474f9a339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pt-BR/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pt-BR/firefox-61.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "21c7a2dab5140350d1bbc152283570f8e00f917c282ee90a9ada6b9f5f8019ef7771b32b147d96aed297b621279b2cff3cb521fc53dce28797defe8f1ef3fe1b"; + sha512 = "2ceaf9a65ee7ed871869fa9cb8a979ec63a3bfc7da0689b8ac72422d5e0947787e8f65299d6d343514c620e6dd30d7762e08705827c9a411f2273dbb4a1f4c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/pt-PT/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/pt-PT/firefox-61.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "db33d53d2917b7a04756cdf70770dfcaa6b8b6e9f427e8a68e977871c7b1735a837668310eac9ad1d7e9c4f53e906a4d4b36b3d87368ebc793e092295cb11721"; + sha512 = "76dd6725a86e89a58aebd8238160ca61017ec8b350538d9952eb6be88d0fa75dbe5de4795a98a6a51739f24734701d4cb82d7a55f46dc12e0b8ad6895ed0fe10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/rm/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/rm/firefox-61.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a22582c2eb28b85c3607bd71c69611d710679fce2889b98c5a56b1bf3f086edd9d7f063b87cc1b7cd4467331e2e8ba38bf003af80d98fc0a2fc828c3b253d01e"; + sha512 = "fd4293256397e979f67b7592fd64e2c568f9d543cd934d3140218802ee681894513729a536f197b5991b859e3c054917393a09bb746f1fcef51072008bf65112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ro/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ro/firefox-61.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "116e904c566c0b744876262545c9ef300bf48a70ec39378aeb961229aa13e37a1c78d68b39bf3c138090101e75ad793c83f428a14dab0f3c186718d3f5f2a883"; + sha512 = "39fc8a9188c3aa2d28376c544ecb5c902a63faa385e426816ffd9186c3329b4a544d541e4115a1d04f6596cceea8dfd910f797dd4c826ce9d9dc070bac8bc027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ru/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ru/firefox-61.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "54c9561ef96fb69d8dd7b067e51fafab2d15e186c71192689f161b7370e2816cc42894fdf4f16829725cbe79e3456c3159f0c8cd9524c6c3c1c3d0f98dae9191"; + sha512 = "65f4214495fda917b5f3530d7e675d932f444fdf78c2f5f6e5888277c66915ef32bf612cb05b2afec20b69f089e536e394568d1834638cb1a468cfed74da7c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/si/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/si/firefox-61.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ffdc8cd3e78b002ebfea0d77508a785a183a2aee8dc82390d68b12e4d43bba8104b9b31d355758c8d729da4b5b9ff095995da11409fae799b4648e85e1cc2fb7"; + sha512 = "512d86b68cc323035a941ba884f7586693c72b70d5bbd62da1d64bb7e9696bf7ae3bc15800c7e7e8ff20cfefb3276c7b322c7c1ccc535b43803a6238c597e19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sk/firefox-61.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e4701fde9df51ae565a9a2383a8e16f723aa804f1f2b0195f055556f733004b1e86978c43398e2673658306dc3fe60c03e360f62a7da5a368f15f5d587724308"; + sha512 = "82d379c83d37f3bb826cfabeb0a4419d184b51fec59642c8851b3535ede97dfa81326330b78aa62b8a6c45e2b201bdce542086f811bbcb98b26bdbe592d01633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sl/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sl/firefox-61.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e41b1d96ae7587f5290337b4334367473cb43ff6aa5930e64cb1d10214c53e75dc3cd108a82125b2faa0f6de4df2e694ba53c94738cebfdc88cf75081ca9b24c"; + sha512 = "5d51e8fbfa4022e21cd78c0249e38909bd7d9d1d9cada358198ba76868035e357eea8470b9b914ea32f5d041be1b049e2004f158f31c48d9c442c397383f77a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/son/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/son/firefox-61.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "68bb8f49c522dded8735a6f8441a872f12463250e5c0e4630168717dce47fee9e4700afc5e8a31cb2f03173eb0298162edf6feb6cd2be77a2b4de4f2d796bd52"; + sha512 = "719b6d8295d4af45313a37113abd347da4b4bfbf6ca8487c6cbbc62c4e903e63f40aff66d3976d1606a14283c6c5bed389f01e10e3469dba3d9961b9ad316e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sq/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sq/firefox-61.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ddf584e9ecda9fe2ef5628c659dfc7033422fbce93c89efdca5628eadd45ebf505cbdb3e75bb915624347bc29dfa0a463d1a219ecdb7d4e6fe2c77c2d6d8138c"; + sha512 = "2472eaefba5e51daa530420190dbcc2dac6e0339f8581011dd6885228f7069756ab280437bd803abb010f071dffebc4b48c5e9686fcc452b7a8040b9dd5093ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sr/firefox-61.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e5c99851e05b27217afc50a5bdbaac42f873292b9b1a84e3e8513d680f00154b701a70e0478884158b04786829c7f818bc35e4016dc5125875f0a1abdb46322a"; + sha512 = "356bd43b3971cbb151b7cba8b481830e101cb6627900bde5598a942583ca1f5b5b1c13286710b5525b17fb01252e069e6786067f68a0f009e3396efe683e2cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/sv-SE/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/sv-SE/firefox-61.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "464ace4c70f5e49afce830e045cb178f0aaec18dd89b77a67c68afcd7f45cd28c7b957a11cda861b322839c2ff89186ff1c1a72318c26c3f37ac24245ec6fe40"; + sha512 = "f4eaddf14567f1e5a783e8ba7c4898603ded65734bf733c51e5105fae94df567bb4fbb600e103192362fac36e64fc6970cc711b87bd806318ab7926af05c93cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ta/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ta/firefox-61.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a7d7fa0c8209843ebb828885cef9307a1789ceb4db0658cfd4cb6e56d076a35d49616780961930b6b1db3673bf2911fec895f51dff273174ae639cf4d1fe66e5"; + sha512 = "7325970571cacfb11cd71d8944399c7b2d56ca5303126442ab8f6477c9cfa808eca7a3573ae11f3ff6993b0e071c5ebc315eb898986a11d53fe1e1508542d906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/te/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/te/firefox-61.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "db0c7ff33692523ddd9b220d0de9f99e8482bf4461f6b4b49fe541b7678655dea28d578ad1099b748751203bf5acdc9437c84094338fc8cdc1a5fdb97a629918"; + sha512 = "a74bd52ddeb2ecd403a5d415f80cf3b456b71c4fffaa86f72911ad40afe13d9e4a9a723b3f8bbd99e542ea0fd3e5d1e85a5575a74357c4f9b7beca509fc76da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/th/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/th/firefox-61.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "56261fea968b32fb84a1ffeffb25e6cece838087ec0f9a3764b87a2d307ab8fb23f269faff67a4586c85182ba171c1810d8a070d6ee74d348d855cca8845ac0d"; + sha512 = "6764c0967665bead96ec5d887ad41a8c3e846d39fbff9d49cae6655066e992826adbd20770842a649b360675e2614015275490567aa328b98c63f593281d1899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/tr/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/tr/firefox-61.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "eacc87cadf7f6b75caa70740e90be2ba31cfd52c2e328bc4e9e7a5b8cf489a441573ba8294519fa81443418d2fa6150e7912c1115c26748654f58a0a368fa2c7"; + sha512 = "11bd142d434008755d047b851014b71d237a1b031e2df99e2c4d9c92b9e126fd268c73f88b94107fcdedbddfa1ec79a05f33f3e05ba7a939e51a9f2275557b56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/uk/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/uk/firefox-61.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "be21d5d297ca1f1dc8e26ad01c92671a3b9c059448288b887eff025f2d3f2bf8d286bd9414d23abe3ca77809d001aeb2a415432807b1f2d47315335d23e31239"; + sha512 = "4cd391146d3d28a4fb1a44b2c0a12126e1f0211024a93868b87d53a1f2595b781c41bef5ba83784f6b0c23f3549f7e3c2d7c6763f96719000277af0071b6c04e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/ur/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/ur/firefox-61.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "5511ef18b96bbbff93bf18c9cbeb2bcc502a2f07e35a32927827d4fced3695672975b4f776f76e5c5c1a4aa657c6732bc25bb720e3dede1268a91c8a733297cd"; + sha512 = "afe67297a149755388a9889addfbf52b0a65c738b02d629c143588bade9944bfde503d3a5e08c44e4de8dd5ee7b42750041603f1f27fdfef037adfd9c6af0c38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/uz/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/uz/firefox-61.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "88292030b13663e8cdd34d4164de670842468e697de38ca7183405f762c1d042353aaf3b0c2a7e05c2fb00694ddae426131c7d997659cacddb9a488f828eebec"; + sha512 = "193e93702158822127c4cd5baa648d66eabbfc67bd02231c2261e5d0ae2db416576f3ddbac1f395eb880feb07f04360e340d1372fe71d4c3793109017e6c186d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/vi/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/vi/firefox-61.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "ec40fe4059a9a6b68a62d805cf991cbe68bc4a11bc8a391828fad86ba99f6b0ae49ae4d570dc60101ee269be47c9a31b25c525f3b865582b9b8e368bcb9408d8"; + sha512 = "dadc73668a7a810f60d4bc829f7b27a3061a289a0ff9c8692e1626f1d4afac61405ac828132b9cf9318149c342986dada06f9e7dfdcbf84e8408dc2db42c93b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/xh/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xh/firefox-61.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "22b5e517485f0f84f8d4bda8157d55f52e18a5e59a0f054b061eb3a9cd61389dccc9d90c65f973bd451c82a9119ff4c0337f38f69db4889e88707f3c9c7216cc"; + sha512 = "7b9c7f218dd31fe680b52d3ebd6740b7473be69a770266bedf663fce8831b270584878037bdccef6b6f536ff35f5eda6c28310966b49c77dd8ce59c02b25031b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/zh-CN/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/zh-CN/firefox-61.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6bf2308be0c3c701cbaa19f31ad2ba2c574e3c27eddd5cfee1cf42db267db21d0b1ffcd9d87ac7d430a800581d60c09d98b121359c01b4a31b1354d348ad8905"; + sha512 = "38ce127e44eaf06ecb83e9e8a8c8d5df6ce2add352ab37a70105a91e43cec7e2ed027945313ffc35e9d2704341e452fac060469421b15d692a52553d972d64c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.2/linux-i686/zh-TW/firefox-60.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/zh-TW/firefox-61.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9e7eca205c77c73dea4ff79cdff1f7ce8a83f87453fd1b421dc8bb684693569c602a74995cf2fd2c6a98f5f920642b395312b5c3a1eba49b9b5aa170c21c9f2e"; + sha512 = "a324d24f47a6d256474b85a4d11a200e877432b0f2bc423d464e5ff0fb7ddf93ade5c3314c64b58973523debead663ddb202d7b86171594f5f5ebe0bd36b057a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 9a3da4307146..0531ec8d94e9 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,13 +1,14 @@ { pname, version, updateScript ? null -, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta +, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [] +, overrides ? {}, extraNativeBuildInputs ? [], meta , isTorBrowserLike ? false }: -{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, icu, libpng, jemalloc +, cairo, icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false @@ -80,22 +81,22 @@ stdenv.mkDerivation (rec { nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx /* cairo */ - icu libpng jemalloc + libevent libstartup_notification libvpx /* cairo */ + icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nss ] - + ++ lib.optional (lib.versionOlder version "61") hunspell ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos; - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = - [ autoconf213 which gnused pkgconfig perl python cargo rustc ] - ++ lib.optional gtk3Support wrapGAppsHook; + [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] + ++ lib.optional gtk3Support wrapGAppsHook ++ extraNativeBuildInputs; preConfigure = '' # remove distributed configuration files @@ -113,7 +114,7 @@ stdenv.mkDerivation (rec { cxxLib=$( echo -n ${gcc}/include/c++/* ) archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -134,7 +135,6 @@ stdenv.mkDerivation (rec { "--with-system-png" # needs APNG support "--with-system-icu" "--enable-system-ffi" - "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" #"--enable-system-cairo" @@ -148,6 +148,7 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] + ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.libclang}/lib" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4e7d35f105c3..f49bfa963189 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }: let @@ -6,10 +6,6 @@ let nixpkgsPatches = [ ./env_var_for_system_dir.patch - - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch ]; firefox60_aarch64_skia_patch = fetchpatch { @@ -24,15 +20,17 @@ rec { firefox = common rec { pname = "firefox"; - version = "60.0.2"; + version = "61.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg"; + sha512 = "0ww2j5gxr7h142lfi0xvckvd7vmnha72j8c0wyyqmmp1rr341f10vfd0hvawiagik4ih6dz8h5pmkl67zdnwqc3z75vwnci20ajlg2s"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; + ]; + + extraNativeBuildInputs = [ python3 ]; meta = { description = "A web browser built from Firefox source tree"; @@ -47,13 +45,17 @@ rec { firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.8.1esr"; + version = "52.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a"; + sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9"; }; - patches = nixpkgsPatches; + patches = nixpkgsPatches ++ [ + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch + ]; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; @@ -66,14 +68,18 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.0.2esr"; + version = "60.1.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1"; + sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch + + # this one is actually an omnipresent bug + # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 + ./fix-pa-context-connect-retval.patch ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = firefox.meta // { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 31081d69a271..5387272a2f05 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.36.4"; + version = "3.38"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz"; - sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik"; + url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; + sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; }; buildInputs = [ perl zlib sqlite ]