From 016d6eaa9d6e001c80f642df468037f4359faf40 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 24 Oct 2016 11:00:07 +0100 Subject: [PATCH 001/219] XTerm: fix app-defaults, fixes menu options --- pkgs/applications/misc/xterm/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index adc0c3c9fb6..6a9dc386be1 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig +{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper , enableDecLocator ? true }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE - ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit + ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper ]; patches = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "--enable-luit" "--enable-mini-luit" "--with-tty-group=tty" + "--with-app-defaults=$(out)/lib/X11/app-defaults" ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". @@ -44,6 +45,12 @@ stdenv.mkDerivation rec { echo '#define USE_UTMP_SETGID 1' ''; + postInstall = '' + for bin in $out/bin/*; do + wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/ + done + ''; + meta = { homepage = http://invisible-island.net/xterm; license = "BSD"; From 95539284860205e8e7433da079bf634050f03f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 25 Oct 2016 07:27:05 +0000 Subject: [PATCH 002/219] xen service: fix iptables race condition in xen-bridge.service The calls to iptables in xen-bridge.service were missing the -w switch, which caused them to fail if another script was calling iptables at the same time. Fix it by adding the -w switch. Addresses https://github.com/NixOS/nixpkgs/issues/19849 . --- nixos/modules/virtualisation/xen-dom0.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index a0b2d5363eb..ead24496bdf 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -331,11 +331,11 @@ in EOF # DHCP - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT # DNS - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name} ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address} @@ -347,11 +347,11 @@ in ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name} # DNS - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT # DHCP - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT ''; }; From fc3eed2cb01825d8024a535b8129ec0eeb0b1b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 26 Oct 2016 16:26:01 +0000 Subject: [PATCH 003/219] xen service: fix wrong netmask handed out by xen-bridge.service The dnsmasq instance run by the xen-bridge.service errorenously hands out 172.16.0.0 as the netmask over DHCP to the VMs. This commit removes the option responsible for that from dnsmasq.conf, so that the proper netmask is inferred by dnsmasq instead. Addresses https://github.com/NixOS/nixpkgs/issues/19883 --- nixos/modules/virtualisation/xen-dom0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index a0b2d5363eb..03e26dd8fb6 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -324,7 +324,7 @@ in domain-needed dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile dhcp-authoritative - dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS + dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END dhcp-no-override no-ping dhcp-leasefile=/var/run/xen/dnsmasq.leasefile From 4f01beb5312096c2eab6f09b771513306ecb381c Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 3 Nov 2016 01:24:10 +0100 Subject: [PATCH 004/219] Adjust ruby gem defaults for scrypt on darwin Without the adjustment I was not able to build scrypt. It was failing because of missing symbols due to the parameter '-arch i386' being appended to the clang calls. --- pkgs/development/ruby-modules/gem-config/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 742c9e49757..42a3fac5622 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -152,6 +152,14 @@ in buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; }; + scrypt = attrs: + if stdenv.isDarwin then { + dontBuild = false; + postPatch = '' + sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile + ''; + } else {}; + snappy = attrs: { buildInputs = [ args.snappy ]; }; @@ -212,4 +220,3 @@ in }; } - From 0ba77712fc818dda1d191326908095e9897fe7c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Oct 2016 16:04:56 +0200 Subject: [PATCH 005/219] opa: 4309 -> 4310 --- pkgs/development/compilers/opa/default.nix | 31 +++++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index a6969477844..9501b5a3a06 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, which, perl, jdk +{ stdenv, fetchFromGitHub, which, perl, jdk , ocamlPackages, openssl , coreutils, zlib, ncurses, makeWrapper -, gcc, binutils, gnumake, nodejs} : +, gcc, binutils, gnumake, nodejs +}: stdenv.mkDerivation rec { pname = "opa"; - version = "4309"; + version = "4310"; name = "${pname}-${version}"; - src = fetchgit { - url = https://github.com/MLstate/opalang.git; - rev = "047f58bfd4be35ee30176156b3718c707a6c0f76"; - sha256 = "1laynwf64713q2vhdkxw679dah6hl3bvmrj8cj836a9k9z7jcc1r"; + src = fetchFromGitHub { + owner = "MLstate"; + repo = "opalang"; + rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5"; + sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; # Paths so the opa compiler code generation will use the same programs as were @@ -27,6 +29,12 @@ stdenv.mkDerivation rec { echo 'let opa_git_sha = "xxxx"' cat ./compiler/buildinfos/buildInfos.ml.post )> ./compiler/buildinfos/buildInfos.ml + for p in configure tools/platform_helper.sh + do + substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1' + done + export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o + export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf ''; prefixKey = "-prefix "; @@ -36,10 +44,10 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph + ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -62,9 +70,6 @@ stdenv.mkDerivation rec { homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = with stdenv.lib.platforms; linux; - # opa was built with nodejs 0.10 which reached end of LTS - # in October 216, it doesn't built with nodejs 4.x - broken = true; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8ab2993447..c33e71b7250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5114,6 +5114,7 @@ in opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; + ocamlPackages = ocamlPackages_4_02; }; inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; From 46e6e2ba170e1c462fd752080c3e7c4bd93ba324 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Sep 2016 16:29:13 +0800 Subject: [PATCH 006/219] heroku: [WIP] 3.43.2 -> 3.43.12 and wrap the downloaded binary The heroku tool has changed and now downloads a binary to do bulk of the work. This PR also downloads the binary to wrap it properly, but due to https://github.com/NixOS/patchelf/issues/66 we cannot ```patchelf``` the binary and it doesn't work. So for now we instead wrap it in a buildFHSUserEnv so at least things are working again. Once the patchelf issue has been solved, I'll update this again. --- pkgs/development/tools/heroku/default.nix | 92 +++++++++++++++++------ 1 file changed, 69 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 0993ee7b544..e78c7a7ff9a 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,28 +1,74 @@ -{ stdenv, fetchurl, postgresql, ruby, makeWrapper, nodejs-6_x }: +{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile +, nodejs-6_x, postgresql, ruby }: with stdenv.lib; -stdenv.mkDerivation rec { - version = "3.43.2"; + +let + version = "3.43.12"; + bin_ver = "5.4.7-8dc2c80"; + + arch = { + "x86_64-linux" = "linux-amd64"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + sha256 = { + "x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + fhsEnv = buildFHSUserEnv { + name = "heroku-fhs-env"; + }; + + heroku = stdenv.mkDerivation rec { + inherit version; + name = "heroku"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn ]; + license = licenses.mit; + platforms = with platforms; unix; + }; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4"; + }; + + bin = fetchurl { + url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz"; + inherit sha256; + }; + + installPhase = '' + cli=$out/share/heroku/cli + mkdir -p $cli + + tar xzf $src -C $out --strip-components=1 + tar xzf $bin -C $cli --strip-components=1 + + wrapProgram $out/bin/heroku \ + --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ + --set XDG_DATA_HOME $out/share \ + --set XDG_DATA_DIRS $out/share + + # When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv + #patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + # $cli/bin/heroku + ''; + + buildInputs = [ fhsEnv ruby postgresql makeWrapper ]; + + doUnpack = false; + }; + +in writeTextFile { name = "heroku-${version}"; - - meta = { - homepage = "https://toolbelt.heroku.com"; - description = "Everything you need to get started using Heroku"; - maintainers = with maintainers; [ aflatter mirdhyn ]; - license = licenses.mit; - platforms = with platforms; unix; - }; - - src = fetchurl { - url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; - sha256 = "1sapbxg7pzi89c95k0vsp8k5bysggkjf58jwck2xs0y4ly36wbnc"; - }; - - installPhase = '' - mkdir -p $out - cp -R * $out/ - wrapProgram $out/bin/heroku --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node + destination = "/bin/heroku"; + executable = true; + text = '' + #!${bash}/bin/bash -e + ${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku ''; - - buildInputs = [ ruby postgresql makeWrapper ]; } From 031d639b4d2119fa5d6ffaa1e24d7243ec959b69 Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Mon, 7 Nov 2016 08:38:34 +0100 Subject: [PATCH 007/219] encryptr: init at 2.0.0 --- pkgs/tools/security/encryptr/default.nix | 57 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/security/encryptr/default.nix diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix new file mode 100644 index 00000000000..95d0299e873 --- /dev/null +++ b/pkgs/tools/security/encryptr/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype +, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes +, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr +, expat, libcap, systemd , dbus, gtk2 , gdk_pixbuf, libnotify +}: + +let + arch = if stdenv.system == "x86_64-linux" then "amd" + else if stdenv.system == "i686-linux" then "i386" + else throw "Encryptr for ${stdenv.system} not supported!"; + + sha256 = if stdenv.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2" + else if stdenv.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm" + else throw "Encryptr for ${stdenv.system} not supported!"; + +in stdenv.mkDerivation rec { + name = "encryptr-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "https://spideroak.com/dist/encryptr/signed/linux/targz/encryptr-${version}_${arch}.tar.gz"; + inherit sha256; + }; + + dontBuild = true; + + rpath = stdenv.lib.makeLibraryPath [ + glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi + libXcursor libXext libXfixes libXrender libXcomposite alsaLib + libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk_pixbuf + libnotify stdenv.cc.cc + ]; + + installPhase = '' + mkdir -pv $out/bin $out/lib + cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin + mv -v $out/bin/encryptr{-bin,} + cp -v lib* $out/lib + ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $out/lib:${rpath} \ + $out/bin/encryptr + ''; + + # If stripping, node-webkit does not find + # its application and shows a generic page + dontStrip = true; + + meta = with stdenv.lib; { + homepage = https://spideroak.com/solutions/encryptr; + description = "Free, private and secure password management tool and e-wallet"; + license = licenses.unfree; + maintainers = with maintainers; [ guillaumekoenig ]; + platform = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246..a6143e168e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -495,6 +495,10 @@ in elvish = callPackage ../shells/elvish { }; + encryptr = callPackage ../tools/security/encryptr { + gconf = gnome2.GConf; + }; + enpass = callPackage ../tools/security/enpass { }; genymotion = callPackage ../development/mobile/genymotion { }; From 63d45ecd65f2d7b22c712475bdfd4c560b1666a3 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 15:03:43 +0300 Subject: [PATCH 008/219] pythonPackages.mezzanine: mark as broken, fixes #19989 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03593957481..ca0cd5f3af2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14070,6 +14070,7 @@ in { license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; + broken = true; # broken dependency of django within filebrowser_safe }; }; From b51f165334dcc30db4d6dd2a1c0c20d036c0fa6e Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 12 Nov 2016 15:35:32 +0100 Subject: [PATCH 009/219] apache-httpd * Introduce listen = [ { ip = "*"; port = 443; } ]; configuartion. * deprecated port = 443 option which is no longer needed --- .../web-servers/apache-httpd/default.nix | 43 +++++++++++++------ .../apache-httpd/per-server-options.nix | 25 ++++++++++- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 397857ea085..2d71bcc0c79 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -16,7 +16,17 @@ let phpMajorVersion = head (splitString "." php.version); - getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; + defaultListen = cfg: if cfg.enableSSL + then [{ip = "*"; port = 443;}] + else [{ip = "*"; port = 80;}]; + + getListen = cfg: + let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen; + in if list == [] + then defaultListen cfg + else list; + + listenToString = l: "${l.ip}:${toString l.port}"; extraModules = attrByPath ["extraModules"] [] mainCfg; extraForeignModules = filter isAttrs extraModules; @@ -25,10 +35,13 @@ let makeServerInfo = cfg: { # Canonical name must not include a trailing slash. - canonicalName = - (if cfg.enableSSL then "https" else "http") + "://" + - cfg.hostName + - (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString (getPort cfg)}" else ""); + canonicalNames = + let defaultPort = (head (defaultListen cfg)).port; in + map (port: + (if cfg.enableSSL then "https" else "http") + "://" + + cfg.hostName + + (if port != defaultPort then ":${toString port}" else "") + ) (map (x: x.port) (getListen cfg)); # Admin address: inherit from the main server if not specified for # a virtual host. @@ -224,7 +237,7 @@ let ++ (map (svc: svc.robotsEntries) subservices))); in '' - ServerName ${serverInfo.canonicalName} + ${concatStringsSep "\n" (map (n: "ServerName ${n}") serverInfo.canonicalNames)} ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases} @@ -326,9 +339,10 @@ let ${let - ports = map getPort allHosts; - uniquePorts = uniqList {inputList = ports;}; - in concatMapStrings (port: "Listen ${toString port}\n") uniquePorts + listen = concatMap getListen allHosts; + toStr = listen: "Listen ${listenToString listen}\n"; + uniqueListen = uniqList {inputList = map toStr listen;}; + in concatStrings uniqueListen } User ${mainCfg.user} @@ -382,15 +396,15 @@ let # Always enable virtual hosts; it doesn't seem to hurt. ${let - ports = map getPort allHosts; - uniquePorts = uniqList {inputList = ports;}; - directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts; + listen = concatMap getListen allHosts; + uniqueListen = uniqList {inputList = listen;}; + directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen; in optionalString (!version24) directives } ${let makeVirtualHost = vhost: '' - + ${perServerConf false vhost} ''; @@ -628,6 +642,8 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; + warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); + users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; @@ -712,5 +728,4 @@ in }; }; - } diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 5abcc5e7490..1d53ce65900 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -28,9 +28,30 @@ with lib; type = types.int; default = 0; description = '' - Port for the server. 0 means use the default port: 80 for http - and 443 for https (i.e. when enableSSL is set). + Port for the server. Option will be removed, use instead. + ''; + }; + + listen = mkOption { + type = types.listOf (types.submodule ( + { + options = { + port = mkOption { + type = types.int; + description = "port to listen on"; + }; + ip = mkOption { + type = types.string; + default = "*"; + description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all."; + }; + }; + } )); + description = '' + List of { /* ip: "*"; */ port = 80;} to listen on ''; + + default = []; }; enableSSL = mkOption { From 01643264c22f718e53adf94cbc84ba8424bd89f3 Mon Sep 17 00:00:00 2001 From: Vlad Ki Date: Sat, 19 Nov 2016 14:48:05 +0200 Subject: [PATCH 010/219] ceres-solver: glog builds on darwin just fine now --- pkgs/development/libraries/ceres-solver/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 24d30937204..7cd848e602a 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , google-gflags ? null -, glog ? null +, glog , runTests ? false }: @@ -12,11 +12,6 @@ assert runTests -> google-gflags != null; let version = "1.10.0"; - - # glog currently doesn't build on darwin - # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 - useGlog = glog != null && !stdenv.isDarwin; - in stdenv.mkDerivation { name = "ceres-solver-${version}"; @@ -26,8 +21,7 @@ stdenv.mkDerivation { sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; }; - buildInputs = [ cmake ] - ++ stdenv.lib.optional useGlog glog + buildInputs = [ cmake glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; inherit eigen; @@ -38,7 +32,6 @@ stdenv.mkDerivation { cmakeFlags = " -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - ${if !useGlog then "-DMINIGLOG=ON" else ""} "; meta = with stdenv.lib; { From f6bbc6c4770b987bdd85a38c86528eeca834f240 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 Nov 2016 17:23:32 -0500 Subject: [PATCH 011/219] linux: 4.9-rc5 -> 4.9-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5838d2db1fa..9979b854693 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc5"; - modDirVersion = "4.9.0-rc5"; + version = "4.9-rc6"; + modDirVersion = "4.9.0-rc6"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0fpfczs13dwsy6nf0a0838399l34pxwxxljs472scvx9jbarm9j9"; + sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; }; features.iwlwifi = true; From e1c1fa695a6794cd6003765ac1d34a00c5a47768 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 21 Nov 2016 12:39:12 -0600 Subject: [PATCH 012/219] pugixml: fix darwin build --- .../development/libraries/pugixml/default.nix | 5 ++++- .../libraries/pugixml/no-long-long.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/pugixml/no-long-long.patch diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 6ce2d9e2ffe..ebb62459091 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp ''; + patches = [] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ]; + meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = http://pugixml.org/; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch new file mode 100644 index 00000000000..46c54e85a1d --- /dev/null +++ b/pkgs/development/libraries/pugixml/no-long-long.patch @@ -0,0 +1,19 @@ +Get rid of long-long feature. This breaks on AppleClang compilers. +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40a7ab0..c84f0f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,9 +26,9 @@ else() + endif() + + # Enable C++11 long long for compilers that are capable of it +-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) +- target_compile_features(pugixml PUBLIC cxx_long_long_type) +-endif() ++# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) ++# target_compile_features(pugixml PUBLIC cxx_long_long_type) ++# endif() + + set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) + From 3bfed00e64d26979227e4706b644cdb7f5d7c2d3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 22 Nov 2016 10:02:06 +0100 Subject: [PATCH 013/219] dico: 2.3 -> 2.4 --- pkgs/servers/dico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 7c2af1dd25e..c530929f79e 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.3"; + name = "dico-2.4"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "13by0zimx90v2j8v7n4k9y3xwmh4q9jdc2f4f8yjs3x7f5bzm2pk"; + sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"; }; hardeningDisable = [ "format" ]; From 5267f3784995e4452429b049f2aadfa8631e09cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Nov 2016 19:20:25 +0100 Subject: [PATCH 014/219] ocamlPackages.ssl: 0.5.2 -> 0.5.3 --- pkgs/development/ocaml-modules/ssl/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index e25b17fb656..81b8c28b452 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, which, openssl, ocaml, findlib}: +{ stdenv, fetchzip, which, openssl, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-ssl-${version}"; - version = "0.5.2"; + name = "ocaml${ocaml.version}-ssl-${version}"; + version = "0.5.3"; - src = fetchurl { - url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; - - sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp"; + src = fetchzip { + url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz"; + sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm"; }; buildInputs = [which ocaml findlib]; From bfe0f29277e1357a9d05aa54631af44c7b10d4f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Nov 2016 19:20:43 +0100 Subject: [PATCH 015/219] ocamlPackages.lwt: 2.5.2 -> 2.6.0 --- .../development/ocaml-modules/lwt/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9eeed1285dc..d3a373ab4db 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: - -let - inherit (stdenv.lib) optional getVersion versionAtLeast; -in +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, ppx_tools, result +, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +}: stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; + sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ] + ++ stdenv.lib.optional ppxSupport ppx_tools; - propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; + propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ]; - configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] - ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ]; + configureScript = "ocaml setup.ml -configure"; + prefixKey = "--prefix "; + configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4" ] + ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; From 0a309311ddf4d4ae0539c75eea036775f3d54faa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Nov 2016 04:20:51 +0100 Subject: [PATCH 016/219] ocamlPackages.topkg: make the installPhase independent of the package name It can then be reused as-is in other derivations (e.g., uucd). --- pkgs/development/ocaml-modules/topkg/default.nix | 11 +++-------- pkgs/development/ocaml-modules/uucd/default.nix | 8 +------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 1b1a127c536..23bcc267066 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: -let ocaml-version = stdenv.lib.getVersion ocaml; in - stdenv.mkDerivation rec { - name = "ocaml${ocaml-version}-topkg-${version}"; + name = "ocaml${ocaml.version}-topkg-${version}"; version = "0.7.8"; src = fetchurl { @@ -16,12 +14,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; - buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build"; + buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build"; createFindlibDestdir = true; - installPhase = '' - opam-installer --script --prefix=$out topkg.install | sh - mv $out/lib/topkg $out/lib/ocaml/${ocaml-version}/site-lib/ - ''; + installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; meta = { homepage = http://erratique.ch/software/topkg; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 73a0ccdacfe..d44309b266a 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -19,13 +19,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; propagatedBuildInputs = [ xmlm ]; From 66b9602a2fb61cc4ed2181ba43476fcc1740ce96 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2016 19:19:35 +0200 Subject: [PATCH 017/219] ocamlPackages.fmt: init at 0.8.0 fmt is an OCaml library of Format pretty-printer combinators. Homepage: http://erratique.ch/software/fmt --- .../development/ocaml-modules/fmt/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/fmt/default.nix diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix new file mode 100644 index 00000000000..9994d156a4c --- /dev/null +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-fmt-0.8.0"; + + src = fetchurl { + url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz; + sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ]; + + inherit (topkg) buildPhase installPhase; + + createFindlibDestdir = true; + + meta = { + homepage = http://erratique.ch/software/fmt; + license = stdenv.lib.licenses.isc; + description = "OCaml Format pretty-printer combinators"; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 391e2c80a57..46f1ce4b023 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -176,6 +176,8 @@ let fix = callPackage ../development/ocaml-modules/fix { }; + fmt = callPackage ../development/ocaml-modules/fmt { }; + fontconfig = callPackage ../development/ocaml-modules/fontconfig { inherit (pkgs) fontconfig; }; From dd45d2552fd950dbaa3ec7c8eaf3fc5f8188aea1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2016 19:32:16 +0200 Subject: [PATCH 018/219] ocamlPackages.alcotest: 0.4.5 -> 0.7.2 --- .../ocaml-modules/alcotest/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index ddc710bc7ed..bf0ae24ff03 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildOcaml, fetchzip, cmdliner, stringext }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }: -buildOcaml rec { - name = "alcotest"; - version = "0.4.5"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-alcotest-${version}"; + version = "0.7.2"; src = fetchzip { url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - sha256 = "1wcn9hkjf4cbnrz99w940qfjpi0lvd8v63yxwpnafkff871dwk6k"; + sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; }; - propagatedBuildInputs = [ cmdliner stringext ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + + propagatedBuildInputs = [ cmdliner astring fmt result ]; + + inherit (topkg) buildPhase installPhase; + + createFindlibDestdir = true; meta = with stdenv.lib; { homepage = https://github.com/mirage/alcotest; From d753527bd4bc1b88c8145f847367e79856407b26 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 21 Nov 2016 21:03:52 +0100 Subject: [PATCH 019/219] fakeroute: init at 0.3 --- pkgs/tools/networking/fakeroute/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/fakeroute/default.nix diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix new file mode 100644 index 00000000000..1cb614e88c0 --- /dev/null +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "fakeroute-${version}"; + version = "0.3"; + + src = fetchurl { + url = "https://moxie.org/software/fakeroute/${name}.tar.gz"; + sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; + }; + + meta = with stdenv.lib; { + description = '' + Makes your machine appear to be anywhere on the internet + to any host running a (UDP) unix traceroute + ''; + homepage = https://moxie.org/software/fakeroute/; + license = licenses.bsd3; + platform = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7663e6d9e..622f2ca5a65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1603,6 +1603,8 @@ in fakeroot = callPackage ../tools/system/fakeroot { }; + fakeroute = callPackage ../tools/networking/fakeroute { }; + fakechroot = callPackage ../tools/system/fakechroot { }; fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle { From 7eb9a03221be0e210d934acc38c281a94122f5b4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 21 Nov 2016 21:04:46 +0100 Subject: [PATCH 020/219] fakeroute: add service --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/fakeroute.nix | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/networking/fakeroute.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c930eb2eb0..e74e60f00ad 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -354,6 +354,7 @@ ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/fan.nix + ./services/networking/fakeroute.nix ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix diff --git a/nixos/modules/services/networking/fakeroute.nix b/nixos/modules/services/networking/fakeroute.nix new file mode 100644 index 00000000000..82a9fb729d8 --- /dev/null +++ b/nixos/modules/services/networking/fakeroute.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fakeroute; + routeConf = pkgs.writeText "route.conf" (concatStringsSep "\n" cfg.route); + +in + +{ + + ###### interface + + options = { + + services.fakeroute = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the fakeroute service. + ''; + }; + + route = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "216.102.187.130" + "4.0.1.122" + "198.116.142.34" + "63.199.8.242" + ]; + description = '' + Fake route that will appear after the real + one to any host running a traceroute. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.fakeroute = { + description = "Fakeroute Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = "root"; + ExecStart = "${pkgs.fakeroute}/bin/fakeroute -f ${routeConf}"; + }; + }; + + }; + +} From f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Wed, 23 Nov 2016 18:22:24 +0100 Subject: [PATCH 021/219] opencv3: added CUDA 8.0 specific patches opencv3: added informative comments --- pkgs/development/libraries/opencv/3.x.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index aa2a1660d6f..5d6221ad877 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, unzip +{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip , zlib , enableIpp ? false , enableContrib ? false @@ -14,7 +14,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen -, enableCuda ? false, cudatoolkit, gcc49 +, enableCuda ? false, cudatoolkit, gcc5 }: let @@ -42,6 +42,17 @@ stdenv.mkDerivation rec { sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429"; }; + patches = [ + (fetchpatch { # Patch for CUDA 8 compatibility + url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch"; + sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1"; + }) + (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0 + url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; + sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; + }) + ]; + preConfigure = let ippicvVersion = "20151201"; ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" @@ -75,7 +86,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optional enableCuda [ cudatoolkit gcc49 ] + ++ lib.optional enableCuda [ cudatoolkit gcc5 ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; From b808dabea049ee1559fef4b37b182ee58d85cc6d Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Nov 2016 23:53:07 +0100 Subject: [PATCH 022/219] delve: init at 0.11.0-alpha Signed-off-by: Vincent Demeester --- pkgs/development/tools/delve/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/delve/default.nix diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix new file mode 100644 index 00000000000..0276b3f9601 --- /dev/null +++ b/pkgs/development/tools/delve/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "delve-${version}"; + version = "0.11.0-alpha"; + + goPackagePath = "github.com/derekparker/delve"; + excludedPackages = "_fixtures"; + + src = fetchFromGitHub { + owner = "derekparker"; + repo = "delve"; + rev = "v${version}"; + sha256 = "10axxlvqpa6gx6pz2djp8bb08b83rdj1pavay0nqdd2crsb6rvgd"; + }; + + meta = { + description = "debugger for the Go programming language"; + homepage = "https://github.com/derekparker/delve"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551b8eaba85..bf2621c66e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11304,6 +11304,8 @@ in inherit (gnome2) gtk gtkmm; }; + delve = callPackage ../development/tools/delve { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; From 0a77d463223316048858ab55a57245a344507053 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Thu, 24 Nov 2016 16:40:52 +0200 Subject: [PATCH 023/219] flow: 0.34.0 -> 0.36.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 213222577d3..1b59285674c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.34.0"; + version = "0.36.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv"; + sha256 = "1371dcn2dy13pm8mb43p61xb2qlyylkiq1hwr0x42lhv1gwdlcnw"; }; installPhase = '' From d395439a10d5e96f3ec395081c0db65291f4614d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 22 Nov 2016 23:47:43 -0200 Subject: [PATCH 024/219] pari/gp: 2.7.6 -> 2.9.0 Adding gp2c compiler, too. --- .../science/math/pari/default.nix | 44 +++++++++++++++---- pkgs/applications/science/math/pari/gp2c.nix | 28 ++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/science/math/pari/gp2c.nix diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0cda65b32c3..27153ea9b08 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,30 +1,56 @@ -{ stdenv, fetchurl, gmp, readline }: +{ stdenv, fetchurl +, gmp, readline, libX11, libpthreadstubs, tex, perl }: stdenv.mkDerivation rec { - version = "2.7.6"; + name = "pari-${version}"; + version = "2.9.0"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr"; + sha256 = "0rljznrvjgy71n4hlpgx1l1yy1qx52mly68k3c05ds21mlvzg92a"; }; - buildInputs = [gmp readline]; + buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; configureScript = "./Configure"; configureFlags = + "--mt=pthread" + "--with-gmp=${gmp.dev} " + "--with-readline=${readline.dev}"; + makeFlags = "all"; + meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; - homepage = "http://pari.math.u-bordeaux.fr/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes raskin ]; - platforms = platforms.linux; + longDescription = '' + PARI/GP is a widely used computer algebra system designed for fast + computations in number theory (factorizations, algebraic number theory, + elliptic curves...), but also contains a large number of other useful + functions to compute with mathematical entities such as matrices, + polynomials, power series, algebraic numbers etc., and a lot of + transcendental functions. PARI is also available as a C library to allow + for faster computations. - inherit version; + Originally developed by Henri Cohen and his co-workers (Université + Bordeaux I, France), PARI is now under the GPL and maintained by Karim + Belabas with the help of many volunteer contributors. + + - PARI is a C library, allowing fast computations. + - gp is an easy-to-use interactive shell giving access to the + PARI functions. + - GP is the name of gp's scripting language. + - gp2c, the GP-to-C compiler, combines the best of both worlds + by compiling GP scripts to the C language and transparently loading + the resulting functions into gp. (gp2c-compiled scripts will typically + run 3 or 4 times faster.) gp2c currently only understands a subset + of the GP language. + ''; + homepage = "http://pari.math.u-bordeaux.fr/"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ertes raskin AndersonTorres ]; + platforms = platforms.linux; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix new file mode 100644 index 00000000000..007514e6552 --- /dev/null +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl +, pari, perl }: + +stdenv.mkDerivation rec { + + name = "gp2c-${version}"; + version = "0.0.10"; + + src = fetchurl { + url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70"; + }; + + buildInputs = [ pari perl ]; + + configureFlags = [ + "--with-paricfg=${pari}/lib/pari/pari.cfg" + "--with-perl=${perl}/bin/perl" ]; + + meta = with stdenv.lib; { + description = "A compiler to translate GP scripts to PARI programs"; + homepage = "http://pari.math.u-bordeaux.fr/"; + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} +# TODO: add it as "source file" for default package diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8600419a70..b2460474d6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16833,7 +16833,8 @@ in wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; - pari = callPackage ../applications/science/math/pari {}; + pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; + gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {}; ratpoints = callPackage ../applications/science/math/ratpoints {}; From c04f1139607ac50f705a13f71aa1b68638b7a480 Mon Sep 17 00:00:00 2001 From: montag451 Date: Sat, 26 Nov 2016 12:50:15 +0100 Subject: [PATCH 025/219] epiphany: enable the playing of HTML5 videos --- pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 6 ++++-- pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index cc31c7e7b97..e472014e38f 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index 9d36648d5cd..015f8213b44 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; From 757638acae621c07d457a3e6a77176675a207dd0 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 26 Nov 2016 12:06:56 +0000 Subject: [PATCH 026/219] ghcWithPackages: fix env NIX_GHC_LIBDIR value Ideally the duplication between the environment shellHook and the ghc wrapper would be removed. Fixes #20730 --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 16855842464..6c75c1f3550 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -304,7 +304,7 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" + export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}" ${shellHook} ''; }; From 2bf9413280e5098768e10b3e5340556710358234 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 26 Nov 2016 14:22:41 +0100 Subject: [PATCH 027/219] gitlab-runner: 1.7.1 -> 1.8.0 (#20719) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0a0f732ccda..2a546c8c907 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.7.1"; + version = "1.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1gcd8rhyxg5sa9g27gih28hi9y6cpjgw1j21jmjm06wzyjdlrsi8"; + sha256 = "0fa8hfdxg903n1dqrqbm4069sr8rq6zx7zzybfyj7qz4mmayp24m"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0i0kd5xm2ii7rzis9h4h99vpi1anjvhcjw732l0rxg4anyxzywjj"; + sha256 = "1rvvz34rsjxrgg59rda6v4k8zw16slwprnh4h5b16yhyp7lcx93q"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "14lx00w502scpb5crxscsm8kvdld1wrxn60a9c45fcccjwl2kkcl"; + sha256 = "0svmy2dc4h6jll80y8j2ml7k0a9krknsp9d0zpsfkw3wcz1wfipl"; }; buildInputs = [ go-bindata ]; From 8ee4a1fd65e78ea82fde096ea8fd510224cecf8b Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Sat, 26 Nov 2016 16:20:02 +0100 Subject: [PATCH 028/219] pyload: add send2trash as dep With this pyload is able to move compressed files into trash after unpacking them --- pkgs/applications/networking/pyload/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index 9be45e126a1..f8cd1ab1d00 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -6,8 +6,8 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pyload"; repo = "pyload"; - rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7"; - sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx"; + rev = "721ea9f089217b9cb0f2799c051116421faac081"; + sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54"; }; patches = @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter - beautifulsoup + beautifulsoup send2trash ]; #remove this once the PR patches above are merged. Needed because githubs diff endpoint From 57d3827d49a6b6c2531e16af2c7f5a25983e6da2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 16:39:03 +0100 Subject: [PATCH 029/219] perl-IO-Socket-SSL: 2.037 -> 2.039 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6688483914b..efc4faa4786 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6664,10 +6664,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.037"; + name = "IO-Socket-SSL-2.039"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "6747226937d652a30a2c9c21d171412737f41f27ea7d82cd74845b3052909469"; + sha256 = "c6379a76860c724a22b79ebe9e91d26bd8a04e3ce035bacfd15de3d9beaf83ac"; }; propagatedBuildInputs = [ NetSSLeay URI ]; # Fix path to default certificate store. From 7f4e514a31602b32583eb5d37a095fe670ecc93d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 26 Nov 2016 16:27:56 +0000 Subject: [PATCH 030/219] su-exec: init at 0.2 --- pkgs/tools/security/su-exec/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/su-exec/default.nix diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix new file mode 100644 index 00000000000..56e40d514bb --- /dev/null +++ b/pkgs/tools/security/su-exec/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "su-exec-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "ncopa"; + repo = "su-exec"; + rev = "v${version}"; + sha256 = "12vqlnpv48cjfh25sn98k1myc7h2wiv5qw2y2awgp6sipzv88abv"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -a su-exec $out/bin/su-exec + ''; + + meta = with stdenv.lib; { + description = "switch user and group id and exec"; + homepage = "https://github.com/ncopa/su-exec"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e68..112462ecc09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3756,6 +3756,8 @@ in sstp = callPackage ../tools/networking/sstp {}; + su-exec = callPackage ../tools/security/su-exec {}; + subsurface = qt55.callPackage ../applications/misc/subsurface { libgit2 = pkgs.libgit2_0_23; From 956e3dec29b1fe9eb23270c80f586fdc059055ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 26 Nov 2016 14:49:22 -0200 Subject: [PATCH 031/219] efl: 1.18.2 -> 1.18.3 (#20728) --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 8df9b48a8bf..c4b8ba8cd05 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1vbvsrrpkvvrmvjavwnp5q77kw5i7vmbaj2vq5mnmrbzamvaybr9"; + sha256 = "1h347sfxajyb5s931m9qga14wwiqci7aicww2imxjhzm8w4fqj07"; }; nativeBuildInputs = [ pkgconfig ]; From 3ae052b2a2a454861130d315bebb4f52b2703559 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Sat, 26 Nov 2016 08:50:01 -0800 Subject: [PATCH 032/219] librecad: 2.0.10 -> 2.1.3 (#20720) --- pkgs/applications/misc/librecad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 3161af33ead..bfb658098b7 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }: stdenv.mkDerivation rec { - version = "2.0.10"; + version = "2.1.3"; name = "librecad-${version}"; src = fetchurl { url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; name = name + ".tar.gz"; - sha256 = "13jr0zkirnnpkbx8ysh7j6sh2psxi1dg7ncfjqzyxrcr2b270rcj"; + sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; }; patchPhase = '' From 6b42bf43d6d4982479ed4678f08b830ad0f967b6 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 26 Nov 2016 17:57:49 +0100 Subject: [PATCH 033/219] wallabag: 2.1.3 -> 2.1.4 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 9db45d6a8e1..4eed952f804 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.3"; + version = "2.1.4"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp"; + sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b"; }; outputs = [ "out" "doc" ]; From e24df8ea69667ba5965406860f9520ad7535fed3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 12:18:00 -0500 Subject: [PATCH 034/219] rkt: 1.19.0 -> 1.20.0 (#20697) --- pkgs/applications/virtualization/rkt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index a1c6927043e..d4a10080aee 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,7 +4,7 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1192.0.0"; + coreosImageRelease = "1235.0.0"; coreosImageSystemdVersion = "231"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.20.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0s3x27m16jl7nw63zg8g522km1zkwwgafrs8l8sc7pfryhnpmvag"; + sha256 = "0cypksr13k0qp6qvbd6y8my1dg82s44k6qkiqkpn1vs2ynjg3i52"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "1j75ad1g217aqar84m9ycl2m71g821hq9yahl4bgjaipx9xnj23g"; + sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq"; }; buildInputs = [ From 2d679dbe745e05e62a0f14c0fad12f83f3d4e2b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 Nov 2016 20:38:17 +0200 Subject: [PATCH 035/219] ntp: Don't use seccomp on non-x86 It only has the allowed system call numbers defined for i386 and x86_64 so it fails to build otherwise. --- pkgs/tools/networking/ntp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a37b1bdbd98..64f4b9008b1 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; +let + withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); +in + stdenv.mkDerivation rec { name = "ntp-4.2.8p9"; @@ -17,12 +21,10 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optionals stdenv.isLinux [ - "--enable-linuxcaps" - "--enable-libseccomp" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" + ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl libseccomp perl ]; + buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; hardeningEnable = [ "pie" ]; From aad48be62bbea40d29e2a6507af38687990ec7de Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Sat, 26 Nov 2016 19:23:37 +0000 Subject: [PATCH 036/219] rogue: Add alternative source archive URLs. As of right now, rogue.rogueforge.net has been down for at least several hours (likely more). We add two mirrors here which are likely to be more reliable. We keep the original download location as a fallback, in case that estimate turns out to be incorrect. --- pkgs/games/rogue/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 6be9b06e907..b246a94715e 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -4,7 +4,11 @@ stdenv.mkDerivation { name = "rogue-5.4.4"; src = fetchurl { - url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz; + urls = [ + "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" + "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" + ]; sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx"; }; From 99522fb742eef35264c0ecb05fd3019bfcc30901 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:18:35 -0200 Subject: [PATCH 037/219] allegro5: 5.0.11 -> 5.2.11 --- pkgs/development/libraries/allegro/5.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 6f05afa4f48..7efccfad243 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,15 +1,19 @@ { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }: +, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora +, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs +, libXdmcp +}: stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.0.11"; + version = "5.2.1.1"; src = fetchurl { url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; - sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9"; + sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm"; }; buildInputs = [ @@ -17,8 +21,15 @@ stdenv.mkDerivation rec { alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa kbproto libjpeg flac + inputproto libXi fixesproto libXfixes + enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp + libpulseaudio libpthreadstubs ]; + patchPhase = '' + sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c + ''; + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; meta = with stdenv.lib; { From ec74f36ccc25526f551bdbb66b20a8046865c156 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:19:07 -0200 Subject: [PATCH 038/219] allegro5unstable: removed --- .../libraries/allegro/5-unstable.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/allegro/5-unstable.nix diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix deleted file mode 100644 index e5a2c38ddab..00000000000 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac -, inputproto, libXi, fixesproto, libXfixes }: - -stdenv.mkDerivation rec { - name = "allegro-${version}"; - version = "5.1.11"; - - src = fetchurl { - url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz"; - sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs"; - }; - - buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa - kbproto libjpeg flac inputproto libXi fixesproto libXfixes - ]; - - patchPhase = '' - sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c - ''; - - cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - - meta = with stdenv.lib; { - description = "A game programming library"; - homepage = http://liballeg.org/; - license = licenses.zlib; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd483d4777..c3c66181140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6477,8 +6477,6 @@ in allegro = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; - allegro5unstable = callPackage - ../development/libraries/allegro/5-unstable.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; From be34ee415baaecc5756d630b4e4619a7d43e1753 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 20:56:30 +0100 Subject: [PATCH 039/219] cpulimit: 2.3 -> 2.4 --- pkgs/tools/misc/cpulimit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index d5b84e6dd46..98b91964e64 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "192r2ghxyn8dm1la65f685nzsbj3dhdrxx3cv3i6cafygs3dyfa0"; + sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2"; }; buildFlags = with stdenv; From c272c662765399706d344ffda3f4fe8e366b8d8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2016 21:24:08 +0100 Subject: [PATCH 040/219] ghc: add release candidate 1 for 8.0.2 --- pkgs/development/compilers/ghc/8.0.2.nix | 84 ++++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++ 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.0.2.nix diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix new file mode 100644 index 00000000000..9ff94f204eb --- /dev/null +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +, hscolour, patchutils +}: + +let + inherit (bootPkgs) ghc; + + fetchFilteredPatch = args: fetchurl (args // { + downloadToTemp = true; + postFetch = '' + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" + ''; + }); +in +stdenv.mkDerivation rec { + version = "8.0.1.20161117"; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz"; + sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874"; + }; + + patches = [ + ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + + # Already applied? + # ./relocation.patch + # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 + # (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) + ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; + + buildInputs = [ ghc perl hscolour ]; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + preConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/cc" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a3cb0a8ca1c..4cdc70fed4f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -46,6 +46,10 @@ rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; }; + ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { + bootPkgs = packages.ghc7103; + inherit (bootPkgs) hscolour; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; @@ -119,6 +123,10 @@ rec { ghc = compiler.ghc801; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; + ghc802 = callPackage ../development/haskell-modules { + ghc = compiler.ghc802; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; From e934ffb28c114890ea4896ba419495a634b7d8b1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 14:19:41 +0100 Subject: [PATCH 041/219] utf8proc: 1.3 -> 2.0.2 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 4b7d06fe8c7..6cef26d3aad 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "1.3"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "07r7djkmd399wl9cn0s2iqjhmm7l5iifp5h1yf2in9s366mlhkkg"; + sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776"; }; makeFlags = [ "prefix=$(out)" ]; From b7eb9241dc2430b6b21529859b14885ad44efc17 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 14:56:30 +0100 Subject: [PATCH 042/219] julia-git: 0.5.0-dev-2016-06-10 -> 0.6.0-dev-2016-11-25 --- pkgs/development/compilers/julia/git.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index ed23bcb73cc..f3fe5ff156c 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -34,10 +34,10 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "a1d9166a440e4a0664c0e6de6ebe25350de56a42"; + libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1sjvly4ylfyj8kxnx0gsjj2f70cg17h302h1i08gfndrqam68za5"; + sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; }; rmathVersion = "0.1"; @@ -55,13 +55,13 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.5.0-dev-2016-06-10"; + version = "0.6.0-dev-2016-11-25"; name = "${pname}-${version}"; src = fetchgit { url = "https://github.com/JuliaLang/${pname}"; - rev = "56d7d6672c7db717dacb5e34f485180c2eba83b2"; - sha256 = "1wbrzdrxp94i7yxdgf3qgrjshmqxi0c4bqz7wy0c0c0kjlg6flmx"; + rev = "03c24644815ba5320d038bb60c08565375fea1d9"; + sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav"; }; prePatch = '' @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; From e3d0fd8bc797d4a0043f4208bfdf33445fdfc553 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 22:33:52 +0100 Subject: [PATCH 043/219] julia-git: pin LLVM 3.9, seems to work fine --- pkgs/development/compilers/julia/git.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index f3fe5ff156c..41f33501eb9 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -3,6 +3,7 @@ , gfortran, m4, makeWrapper, patchelf, perl, which, python2 # libjulia dependencies , libunwind, readline, utf8proc, zlib +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra @@ -22,12 +23,6 @@ let in let - llvmVersion = "3.7.1"; - llvm = fetchurl { - url = "http://llvm.org/releases/${llvmVersion}/llvm-${llvmVersion}.src.tar.xz"; - sha256 = "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"; - }; - dsfmtVersion = "2.2.3"; dsfmt = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; @@ -66,7 +61,6 @@ stdenv.mkDerivation rec { prePatch = '' mkdir deps/srccache - cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz" cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" @@ -85,7 +79,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib + zlib llvm ]; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -125,7 +119,7 @@ stdenv.mkDerivation rec { "USE_SYSTEM_LIBGIT2=1" "USE_SYSTEM_LIBUNWIND=1" # 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1 - "USE_SYSTEM_LLVM=0" + "USE_SYSTEM_LLVM=1" "USE_SYSTEM_MPFR=1" "USE_SYSTEM_OPENLIBM=1" "USE_SYSTEM_OPENSPECFUN=1" @@ -142,7 +136,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse + openspecfun pcre2 suitesparse llvm ]; dontStrip = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e68..92b5dc42dea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5052,6 +5052,7 @@ in julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; + llvm = llvm_39; }); kotlin = callPackage ../development/compilers/kotlin { }; From cc77360bed83777b48bb6c055a2e168fc3ce1493 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 16:28:58 -0500 Subject: [PATCH 044/219] linux: 4.4.34 -> 4.4.35 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0fad9a578ef..8e92afca6e4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.34"; + version = "4.4.35"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xrk7adgapr4wpid6l6s05cypy3r28skynajy2h73xciradaqs9b"; + sha256 = "1spqkh0bsd2s4qjlaa5q0cr2qdlw0bflxinr451dbhwrzdwfnaz9"; }; kernelPatches = args.kernelPatches; From b47307bd74f14e1de0389a41ccb6423f945e9ff6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 16:29:23 -0500 Subject: [PATCH 045/219] linux: 4.8.10 -> 4.8.11 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index e0e8fbaf95e..4937c2271c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.10"; + version = "4.8.11"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; + sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; }; kernelPatches = args.kernelPatches; From db7e616b4546aca996d84c6c870d9c4f4f4b3ce6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 22:41:32 +0100 Subject: [PATCH 046/219] julia-git: add macOS frameworks, hopefully that's useful --- pkgs/development/compilers/julia/git.nix | 6 +++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 41f33501eb9..73f0e67baa5 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -8,6 +8,8 @@ , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices }: with stdenv.lib; @@ -80,7 +82,9 @@ stdenv.mkDerivation rec { arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib llvm - ]; + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92b5dc42dea..31fc4c5c609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5052,6 +5052,7 @@ in julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; llvm = llvm_39; }); From a9aa372186fd05bc96fcda938d5621bed15167d2 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Nov 2016 11:29:03 +0900 Subject: [PATCH 047/219] pamix: 1.4.1 -> 1.5 --- pkgs/applications/audio/pamix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 8f71c848f18..dbf3cd92b5d 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pamix-${version}"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { owner = "patroclos"; repo = "pamix"; - rev = "v${version}"; - sha256 = "06pxpalzynb8z7qwhkfs7sj823k9chdmpyj40rp27f2znf2qga19"; + rev = version; + sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; From d0e8117ccb3a1d4665b6b327f509373e4b6be265 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Nov 2016 11:37:20 +0900 Subject: [PATCH 048/219] rainbowstream: 1.3.5 -> 1.3.6 --- .../python-modules/rainbowstream/setup.patch | 24 ------------------- pkgs/top-level/python-packages.nix | 7 ++---- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/rainbowstream/setup.patch diff --git a/pkgs/development/python-modules/rainbowstream/setup.patch b/pkgs/development/python-modules/rainbowstream/setup.patch deleted file mode 100644 index 55afa49a96e..00000000000 --- a/pkgs/development/python-modules/rainbowstream/setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/setup.py b/setup.py -index 07b5913..2b7b15e 100644 ---- a/setup.py -+++ b/setup.py -@@ -24,15 +24,16 @@ install_requires = [ - ] - - # Default user (considers non virtualenv method) --user = os.environ.get('SUDO_USER', os.environ['USER']) -+user = os.environ.get('SUDO_USER', os.environ.get('USER', None)) - - # Copy default config if not exists - default = os.path.expanduser("~") + os.sep + '.rainbow_config.json' - if not os.path.isfile(default): - cmd = 'cp rainbowstream/colorset/config ' + default - os.system(cmd) -- cmd = 'chown ' + quote(user) + ' ' + default -- os.system(cmd) -+ if user: -+ cmd = 'chown ' + quote(user) + ' ' + default -+ os.system(cmd) - cmd = 'chmod 777 ' + default - os.system(cmd) - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d19e2d7780..d80324a9fb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14248,18 +14248,15 @@ in { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.5"; + version = "1.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; - sha256 = "0a8bs9g81ns47d4vaj5pfgw9zwbcp0nivlm5rps4dlb6qwvzni1w"; + sha256 = "04ki61mc2f5rw60zssr1rr6dmjmvhlws5rpnwd3zih6pi5b7cy4a"; }; - doCheck = false; - patches = [ ../development/python-modules/rainbowstream/image.patch - ../development/python-modules/rainbowstream/setup.patch ]; postPatch = '' From f7ad0223ce934e59c41ebdcfb8f09bf599d5321c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Nov 2016 09:36:51 +0100 Subject: [PATCH 049/219] pythonPackages.ipywidgets: fix tests --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d80324a9fb1..ffb2bf35faf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12831,7 +12831,7 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; meta = { From 868bd67aa9d4bf9e69b455a781c3a4eaadb422e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Nov 2016 09:37:18 +0100 Subject: [PATCH 050/219] pythonPackages.jupyter_console: disable tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ffb2bf35faf..cd206511f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7911,6 +7911,9 @@ in { ipykernel ]; + # ValueError: underlying buffer has been detached + doCheck = false; + meta = { description = "Jupyter terminal console"; homepage = "http://jupyter.org/"; From fcf9f5d4d54a1771243dbcea111b1566294f0acc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Nov 2016 10:13:24 +0100 Subject: [PATCH 051/219] julia: 0.4.6 -> 0.4.7 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 335de9b50cd..214b3153481 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -48,12 +48,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.4.6"; + version = "0.4.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "17wsppmsf782icyzri34zha61wfx4brfq4h68qg17w6zimd2plg5"; + sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf"; }; prePatch = '' From 5d5346d824fdf19d5ac879bb4c98e6381d41c76d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Nov 2016 10:14:10 +0100 Subject: [PATCH 052/219] julia_05: init at 0.5.0; right now backtrace-related tests are disabled because they fail in this configuration, but the rest works --- pkgs/development/compilers/julia/0.5.nix | 185 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 192 insertions(+) create mode 100644 pkgs/development/compilers/julia/0.5.nix diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix new file mode 100644 index 00000000000..04ef7b86c48 --- /dev/null +++ b/pkgs/development/compilers/julia/0.5.nix @@ -0,0 +1,185 @@ +{ stdenv, fetchgit, fetchurl +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, runCommand +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +, llvm, libffi, ncurses +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; + suitesparse_ = suitesparse; +in +let + arpack = arpack_.override { inherit openblas; }; + suitesparse = suitesparse_.override { inherit openblas; }; +in + +let + dsfmtVersion = "2.2.3"; + dsfmt = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; + sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; + }; + + libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; + libuv = fetchurl { + url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; + sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; + }; + + rmathVersion = "0.1"; + rmath-julia = fetchurl { + url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; + sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + }; + + virtualenvVersion = "15.0.0"; + virtualenv = fetchurl { + url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; + sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; + }; +in + +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv"; + }; + prePatch = '' + mkdir deps/srccache + cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" + cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" + cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" + cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" + ''; + + patches = [ + ./0001.1-use-system-utf8proc.patch + ./0002-use-system-suitesparse.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace replutil cmdlineargs compile; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc + zlib llvm + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_SUITESPARSE=1" + "SUITESPARSE_LIB=-lsuitesparse" + "SUITESPARSE_INC=-I${suitesparse}/include" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_LLVM=1" + "LLVM_VER=3.8.1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + ]; + + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 suitesparse llvm + ]; + + dontStrip = true; + dontPatchELF = true; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + set + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + ''; + + postInstall = '' + for prog in "$out/bin/julia" "$out/bin/julia-debug"; do + wrapProgram "$prog" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + done + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06ec3496941..7bec1275dbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5051,6 +5051,13 @@ in llvm = llvm_37; }; + julia_05 = callPackage ../development/compilers/julia/0.5.nix { + gmp = gmp6; + openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + llvm = llvm_38; + }; + julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; From 244f0456f06066a87ba37e610f638b60489e14ef Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 12:21:25 +0300 Subject: [PATCH 053/219] genymotion: add menu item --- pkgs/development/mobile/genymotion/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index f21c25a60f7..d5f1b09a946 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,5 @@ { stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +, xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -17,17 +18,24 @@ stdenv.mkDerivation rec { sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; }; - buildInputs = [ makeWrapper which ]; + buildInputs = [ makeWrapper which xdg_utils ]; unpackPhase = '' + mkdir -p phony-home $out/share/applications + export HOME=$TMP/phony-home + mkdir ${name} echo "y" | sh $src -d ${name} sourceRoot=${name} + + substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ + $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec" ''; installPhase = '' mkdir -p $out/bin $out/libexec mv genymotion $out/libexec/ + ln -s $out/libexec/genymotion/{genymotion,player} $out/bin ''; fixupPhase = '' @@ -38,7 +46,7 @@ stdenv.mkDerivation rec { patchExecutable() { patchInterpreter "$1" - makeWrapper "$out/libexec/genymotion/$1" "$out/bin/$1" \ + wrapProgram "$out/libexec/genymotion/$1" \ --set "LD_LIBRARY_PATH" "${libPath}" } From af1dacc2c33ce97fbd36a4856afcc3297c8645e1 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 13:18:24 +0300 Subject: [PATCH 054/219] genymotion: 2.7.2 -> 2.8.0 --- pkgs/development/mobile/genymotion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index d5f1b09a946..745111171bb 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "genymotion-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = requireFile { - url = https://www.genymotion.com/account/login/; + url = https://www.genymotion.com/download/; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; + sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; buildInputs = [ makeWrapper which xdg_utils ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.genymotion.com/; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; }; } From c4650769f53cd61ad2c0127e1de4d3278d85f562 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 25 Nov 2016 19:28:20 -0800 Subject: [PATCH 055/219] f3: newer git rev, build extra binaries --- pkgs/tools/filesystems/f3/default.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index e7f20b1e6b3..0ea8b1b8986 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub }: - +{ stdenv, fetchFromGitHub +, parted, udev +}: +let + version = "unstable-2016-11-26"; +in stdenv.mkDerivation rec { name = "f3-${version}"; - version = "6.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; repo = "f3"; - rev = "v${version}"; - sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; + rev = "eabf001f69a788e64912bc9e812c118a324077d5"; + sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; }; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ parted udev ]; + patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 + "all" # f3read, f3write + "extra" # f3brew, f3fix, f3probe + ]; + + installFlags = [ "PREFIX=$(out)" + "install" + "install-extra" + ]; + meta = { description = "Fight Flash Fraud"; homepage = http://oss.digirati.com.br/f3/; From 22e9476e5947cce18a974ce5470317fb61638431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Sun, 27 Nov 2016 15:06:34 +0100 Subject: [PATCH 056/219] youtube-dl: 2016-11-22 -> 2016-11-27 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 70719bdfdf1..c1d4d3c1556 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.22"; + version = "2016.11.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282"; + sha256 = "6ecc3996e28b6274d159643641a964098549b4cb8b33a3a3481148b88166e2cc"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f4d163aab740aac77287fde4378da9c6c579351b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 15:48:40 +0100 Subject: [PATCH 057/219] zsh-navigation-tools: 2.1.16 -> 2.2.7 --- pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index b0939a4698b..108071edb64 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.16"; + version = "2.2.7"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1ccb4f5md8wn60mymk91y2p4fq9f666bc5zc9xwx1q2wra8j4yf5"; + sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8"; }; dontBuild = true; From 0a77fc86b27412671215bcc7450fbd45f9fbfa04 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 27 Nov 2016 06:52:38 -0800 Subject: [PATCH 058/219] f3: corrected version number --- pkgs/tools/filesystems/f3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 0ea8b1b8986..4af076e8f2c 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -2,7 +2,7 @@ , parted, udev }: let - version = "unstable-2016-11-26"; + version = "6.0-2016.11.16-unstable"; in stdenv.mkDerivation rec { name = "f3-${version}"; From e8f7c31dfbf9ce3b268d91d10d9ab7760c9ae0e0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 15:57:56 +0100 Subject: [PATCH 059/219] opkg: 0.3.1 -> 0.3.3 --- pkgs/tools/package-management/opkg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 059f63495d1..9d99af2e59a 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,15 +2,15 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.3.3"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; + sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl libxml2 - autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; From b74d732f67b4297176d014fd0157bc9546fe2bff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Nov 2016 17:34:49 +0100 Subject: [PATCH 060/219] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-8-gcc531ff. --- .../haskell-modules/hackage-packages.nix | 1325 ++++++++++++++--- 1 file changed, 1078 insertions(+), 247 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65904d0d249..bd046c77d50 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -726,6 +726,53 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_1_2" = callPackage + ({ mkDerivation, alex, array, base, binary, boxes, bytestring + , containers, cpphs, data-hash, deepseq, directory, EdisonAPI + , EdisonCore, edit-distance, emacs, equivalence, filemanip + , filepath, geniplate-mirror, happy, hashable, hashtables + , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty + , process, QuickCheck, strict, template-haskell, text, time + , transformers, transformers-compat, unordered-containers, xhtml + , zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.1.2"; + sha256 = "fb272bd6f7d532320c669b96faa85088b37bae02d906e9a9f764bc8e8639fb5e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary boxes bytestring containers data-hash deepseq + directory EdisonAPI EdisonCore edit-distance equivalence filepath + geniplate-mirror hashable hashtables haskeline haskell-src-exts + monadplus mtl parallel pretty process QuickCheck strict + template-haskell text time transformers transformers-compat + unordered-containers xhtml zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ + base binary containers directory filemanip filepath + haskell-src-exts mtl process + ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + homepage = "http://wiki.portal.chalmers.se/agda/"; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -6117,6 +6164,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_7_13" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.7.13"; + sha256 = "fe99d9434a2dbbac5385cb6690cbb6e2f2eb25df6ab5ce99c8121fc3fdddbd4c"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -6749,8 +6820,8 @@ self: { }: mkDerivation { pname = "HDBC-odbc"; - version = "2.5.0.0"; - sha256 = "729982fb31e2d7816e8600212236f32d9d9a59191d73ce57fce097be2234953b"; + version = "2.5.0.1"; + sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99"; libraryHaskellDepends = [ base bytestring concurrent-extra HDBC mtl time utf8-string ]; @@ -7515,6 +7586,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HMarkov" = callPackage + ({ mkDerivation, base, lens, mtl, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "HMarkov"; + version = "1.0.0.3"; + sha256 = "0f43a9e0dd4da3258f89668e240081f4d0144003b8b45283ea3a0b446715a8a7"; + libraryHaskellDepends = [ base lens mtl random vector ]; + testHaskellDepends = [ + base QuickCheck random tasty tasty-hunit tasty-quickcheck vector + ]; + homepage = "https://github.com/swizzard/HMarkov#readme"; + description = "Markov-generated sequences"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HNM" = callPackage ({ mkDerivation, base, containers, directory, glib, gtk, haskell98 , mtl, process, regex-posix, unix @@ -20724,8 +20812,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.5"; - sha256 = "4a86928ea9d289f82a5e81227dd2f5b29870fa3be608f135e4469e5a8f08c865"; + version = "4.6"; + sha256 = "1e84a2957a7f974e4e11cdaa2a7c4ec3da5b03fe15a0fed07427e9ee74712bba"; libraryHaskellDepends = [ array base containers mtl random vector ]; @@ -20757,8 +20845,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.2"; - sha256 = "19dac37eb6436ce9dbcda7b8a30ee914ec28b6704321512571c27c483ac8b8cc"; + version = "0.3"; + sha256 = "400b00cde06525918c0ece01f1a5c411b27c4d5f45d9316ccb03380255e1a911"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl random stm time @@ -20854,14 +20942,15 @@ self: { "aivika-realtime" = callPackage ({ mkDerivation, aivika, aivika-transformers, async, base - , containers, mtl, stm, time + , containers, mtl, random, stm, time }: mkDerivation { pname = "aivika-realtime"; - version = "0.1"; - sha256 = "843febd0367be16058268bb2d3e5cb65b42018c69aa21dd1351089b72a4a81bf"; + version = "0.1.2"; + sha256 = "fb60a9126563c09f44e915991f655cb062807deb3c8a51892d6bfba97d30de7a"; libraryHaskellDepends = [ - aivika aivika-transformers async base containers mtl stm time + aivika aivika-transformers async base containers mtl random stm + time ]; homepage = "http://www.aivikasoft.com/en/products/aivika.html"; description = "Soft real-time simulation module for the Aivika library"; @@ -20874,8 +20963,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.5.1"; - sha256 = "76bfd156d6e9d037adf65b22ea1b66c75ed15ec00fd6b773c34e1c60ac12444a"; + version = "4.6"; + sha256 = "7b4c8179260f865fb6e00005c679ee9894403f098ae462082891bd0f6bed59ef"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -24407,20 +24496,22 @@ self: { }) {}; "amby" = callPackage - ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour - , data-default, data-default-class, doctest, either, exceptions - , lens, mtl, mwc-random, pretty-display, process, safe, scientific - , statistics, tasty, tasty-hunit, vector, vector-algorithms + ({ mkDerivation, base, bytestring, cassava, Chart, Chart-cairo + , Chart-diagrams, colour, containers, data-default + , data-default-class, datasets, doctest, either, exceptions, extra + , foldl, lens, mtl, mwc-random, pretty-display, process, safe + , scientific, statistics, tasty, tasty-hunit, text, vector + , vector-algorithms }: mkDerivation { pname = "amby"; - version = "0.3.1"; - sha256 = "c13b92e077e577df6e34da03bd267f9e9c29a0f3345e6935915aabf8a3b3fda5"; + version = "0.3.2"; + sha256 = "fa7b70c21377bb19396a69a5782abb0400ce19d99082d6a9f191c790a5049369"; libraryHaskellDepends = [ - base Chart Chart-cairo Chart-diagrams colour data-default - data-default-class either exceptions lens mtl mwc-random - pretty-display process safe scientific statistics vector - vector-algorithms + base bytestring cassava Chart Chart-cairo Chart-diagrams colour + containers data-default data-default-class datasets either + exceptions extra foldl lens mtl mwc-random pretty-display process + safe scientific statistics text vector vector-algorithms ]; testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; homepage = "https://github.com/jsermeno/amby#readme"; @@ -24694,6 +24785,8 @@ self: { pname = "angel"; version = "0.6.2"; sha256 = "caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358"; + revision = "1"; + editedCabalFile = "b8dc3c8526dde130a1acd260a062b184f0c614cb459116455d8637a83702a23f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28772,6 +28865,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-simple" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs + , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet + , text + }: + mkDerivation { + pname = "aws-simple"; + version = "0.1.0.0"; + sha256 = "70091063d883e2320a622a2909abc093e11a47d0a18c64b6557679e401ba918f"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder + bytestring conduit lens mtl resourcet text + ]; + homepage = "https://github.com/agrafix/aws-simple#readme"; + description = "Dead simple bindings to commonly used AWS Services"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-sns" = callPackage ({ mkDerivation, aeson, aws, aws-general, base, blaze-builder , bytestring, conduit, containers, errors, http-conduit, http-types @@ -33491,18 +33602,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bloodhound_0_11_1_0" = callPackage + "bloodhound_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, derive, directory, doctest, doctest-prop - , errors, exceptions, filepath, hashable, hspec, http-client - , http-types, mtl, mtl-compat, network-uri, QuickCheck - , quickcheck-properties, scientific, semigroups, text, time - , transformers, unordered-containers, vector + , data-default-class, directory, doctest, errors, exceptions + , filepath, generics-sop, hashable, hspec, http-client, http-types + , mtl, mtl-compat, network-uri, QuickCheck, quickcheck-properties + , scientific, semigroups, temporary, text, time, transformers, unix + , unordered-containers, vector }: mkDerivation { pname = "bloodhound"; - version = "0.11.1.0"; - sha256 = "ecaf8e6d1bcb197387f8f7862420a362f33f03cb86fd068b8b9a1e462813d557"; + version = "0.12.0.0"; + sha256 = "b3673675c75ee393281502ce45d0d9768c6a9165df9cebc23beb25539d7acbdc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -33510,10 +33621,10 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers derive directory doctest - doctest-prop errors filepath hspec http-client http-types mtl - QuickCheck quickcheck-properties semigroups text time - unordered-containers vector + aeson base bytestring containers directory doctest errors + exceptions filepath generics-sop hspec http-client http-types mtl + network-uri QuickCheck quickcheck-properties semigroups temporary + text time unix unordered-containers vector ]; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; @@ -33799,6 +33910,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bolt" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, containers + , hashable, network, network-uri, text, unordered-containers + , vector + }: + mkDerivation { + pname = "bolt"; + version = "0.1.0.3"; + sha256 = "7779436fc5da3ea036547273a82dd10909caebf76a294b3741aa5097b75aaa22"; + libraryHaskellDepends = [ + base bifunctors bytestring cereal containers hashable network + network-uri text unordered-containers vector + ]; + homepage = "https://github.com/bflyblue/bolt#readme"; + description = "Bolt driver for Neo4j"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops @@ -33838,8 +33967,8 @@ self: { }: mkDerivation { pname = "bond-haskell"; - version = "0.1.4.1"; - sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900"; + version = "0.1.5.0"; + sha256 = "db62f0b0913e92c1892cdbeeb67a0397e911eae67aa3de8255bc61d19fb18606"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -33862,8 +33991,8 @@ self: { }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.4.1"; - sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac"; + version = "0.1.5.0"; + sha256 = "08fcc16b2990bb16ad43fa9cccb460f8299243ddc4a277395bc230021a5ebc13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35785,8 +35914,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.33"; - sha256 = "ae69fd45365f670b3d36274884b1a7d1b1ec0429f7775ee79d5d813d82e93193"; + version = "4.35.3"; + sha256 = "09d5531215a3c963adc80bd40402d16c7a59698537ee4d21c7d3f9b7c486d56f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35799,6 +35928,10 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; + testHaskellDepends = [ + base Cabal containers debian Diff directory filepath hsemail HUnit + lens pretty process text + ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -40429,8 +40562,8 @@ self: { ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { pname = "classyplate"; - version = "0.1.0.0"; - sha256 = "b10d14b679f41e41755013b18b11158310bf80ff415cb369444a8f82388f6fbc"; + version = "0.2.0.0"; + sha256 = "962081fdb262da338d9e1076cb6ac21a75a6230f641301f06580de88cf796188"; libraryHaskellDepends = [ base template-haskell type-list ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; @@ -42102,15 +42235,16 @@ self: { }) {}; "colour-space" = callPackage - ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups - , vector-space + ({ mkDerivation, base, colour, constrained-categories, JuicyPixels + , linear, linearmap-category, manifolds, semigroups, vector-space }: mkDerivation { pname = "colour-space"; - version = "0.1.0.0"; - sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48"; + version = "0.1.1.0"; + sha256 = "1dcb84098dfbe7389e4794fef80e629a95cc3607f5277092965f8a4604152339"; libraryHaskellDepends = [ - base colour JuicyPixels manifolds semigroups vector-space + base colour constrained-categories JuicyPixels linear + linearmap-category manifolds semigroups vector-space ]; homepage = "https://github.com/leftaroundabout/colour-space"; description = "Instances of the manifold-classes for colour types"; @@ -43019,15 +43153,15 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, bytestring, hashable, QuickCheck, text - , thrift, unordered-containers, vector + ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck + , text, thrift, unordered-containers, vector }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.0"; - sha256 = "68312cbefd0aa617b253c5e4d89dbdd71a394c74dfee9eb20426222fff017e40"; + version = "0.1.0.4"; + sha256 = "6fbe447023cb0b5f7b3753e354af34c8a35f1497b5829a907728e336de64eb2b"; libraryHaskellDepends = [ - base bytestring hashable QuickCheck text thrift + base bytestring containers hashable QuickCheck text thrift unordered-containers vector ]; homepage = "https://github.com/hltcoe"; @@ -47589,22 +47723,19 @@ self: { }) {}; "cudd" = callPackage - ({ mkDerivation, array, base, c2hs, cudd, dddmp, epd, mtl, mtr, st - , transformers, util - }: + ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { pname = "cudd"; - version = "0.1.0.2"; - sha256 = "59008e024553375eeeabfd9dd7c2e8a186b0edd75edb52640e38cc9d31911a7e"; + version = "0.1.0.3"; + sha256 = "8e0684c4e01f4d48140d3cedbe15548c747a389e4e32bbe388a1341350dd675d"; libraryHaskellDepends = [ array base mtl transformers ]; - librarySystemDepends = [ cudd dddmp epd mtr st util ]; + librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/adamwalker/haskell_cudd"; description = "Bindings to the CUDD binary decision diagrams library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; - inherit (pkgs) st; util = null;}; + }) {cudd = null;}; "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath @@ -49242,8 +49373,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-has"; - version = "0.1.0.0"; - sha256 = "8b5b4a68965b8c31ef10cc2ae37e7c4d09ae44ee0790002adb8ccf1ad6a48ab2"; + version = "0.2.1.0"; + sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/winterland1989/data-has"; description = "Simple extensible product"; @@ -50117,6 +50248,24 @@ self: { license = "GPL"; }) {}; + "datasets" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, directory + , file-embed, filepath, hashable, HTTP, stringsearch, text, time + , vector + }: + mkDerivation { + pname = "datasets"; + version = "0.2.0.2"; + sha256 = "e79f13a2001031230b968d582bc5c3567568b673d4ea9cc3571451c2deaddae2"; + libraryHaskellDepends = [ + aeson base bytestring cassava directory file-embed filepath + hashable HTTP stringsearch text time vector + ]; + homepage = "https://github.com/glutamate/datasets"; + description = "Classical data sets for statistics and machine learning"; + license = stdenv.lib.licenses.mit; + }) {}; + "dataurl" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , HTF, text @@ -54796,8 +54945,8 @@ self: { }: mkDerivation { pname = "dmenu"; - version = "0.3.0.0"; - sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb"; + version = "0.3.1.0"; + sha256 = "0c5e0cc0e78ceffcb762e507e083b22ce509e21e87088052597ab1e6dc5bd899"; libraryHaskellDepends = [ base containers directory lens mtl process transformers ]; @@ -54806,6 +54955,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dmenu-pkill" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-pkill"; + version = "0.1.0.0"; + sha256 = "5dc7055896945f60231a9eeda11242c1c739d7e9eed316866597305df941fa75"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-pkill"; + description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dmenu-pmount" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-pmount"; + version = "0.1.0.0"; + sha256 = "2a7bc00b47554944c5ac3a88897325d47dcf64bdc9f229214ea64474cfb5009c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-pmount"; + description = "Mounting and unmounting linux devices as user with dmenu and pmount"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dmenu-search" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-search"; + version = "0.1.0.0"; + sha256 = "c3aa52379389c120b2858796baa0b1dc21212573ed2ca4cf2b5b9141196094c6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-search"; + description = "dmenu script for searching the web with customizable search engines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -54829,6 +55032,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_10" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.10"; + sha256 = "ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -56538,6 +56765,8 @@ self: { pname = "dynamic-plot"; version = "0.2.0.0"; sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528"; + revision = "1"; + editedCabalFile = "a527e3da82b5b147ba9cfed25526a2a34eb07cd42710dbea9aee590a15d88fed"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -57806,6 +58035,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-bridge_0_4_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.4.0"; + sha256 = "45721d5ee406b21c9b9cab180a7a0ee618d8492aecd131080345d772e6b51fd9"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + homepage = "https://github.com/agrafix/elm-bridge"; + description = "Derive Elm types from Haskell types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -61736,6 +61983,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fclabels_2_0_3_2" = callPackage + ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers + }: + mkDerivation { + pname = "fclabels"; + version = "2.0.3.2"; + sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0"; + libraryHaskellDepends = [ base mtl template-haskell transformers ]; + testHaskellDepends = [ + base HUnit mtl template-haskell transformers + ]; + homepage = "https://github.com/sebastiaanvisser/fclabels"; + description = "First class accessor labels implemented as lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fclabels-monadlib" = callPackage ({ mkDerivation, base, fclabels, monadLib }: mkDerivation { @@ -64078,6 +64342,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fold-debounce_0_2_0_4" = callPackage + ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay + , time + }: + mkDerivation { + pname = "fold-debounce"; + version = "0.2.0.4"; + sha256 = "429702d10061c9c518a119ece8d3bc890feb124a524a3b6a5cdd31a17bcca67a"; + libraryHaskellDepends = [ + base data-default-class stm stm-delay time + ]; + testHaskellDepends = [ base hspec stm time ]; + homepage = "https://github.com/debug-ito/fold-debounce"; + description = "Fold multiple events that happen in a given period of time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fold-debounce-conduit" = callPackage ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet , stm, transformers, transformers-base @@ -64568,6 +64850,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_2_4" = callPackage + ({ mkDerivation, base, clock, old-locale, scientific, text + , text-format, time + }: + mkDerivation { + pname = "formatting"; + version = "6.2.4"; + sha256 = "432db74037d3bc326ab70e6e033502f818d9694535dbfc4c949cb50f72f33367"; + libraryHaskellDepends = [ + base clock old-locale scientific text text-format time + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -64698,8 +64996,8 @@ self: { }: mkDerivation { pname = "foscam-directory"; - version = "0.0.7"; - sha256 = "ae30ec2b2a5f737436d4438ed1071a549a0d37bbf8871014aabe702046382312"; + version = "0.0.8"; + sha256 = "0b5ba1bd30d081d5ce32beb92047e10978eb2050489317516d26b3a87061bb66"; libraryHaskellDepends = [ base directory foscam-filename lens pretty trifecta utf8-string ]; @@ -64740,8 +65038,8 @@ self: { }: mkDerivation { pname = "foscam-sort"; - version = "0.0.2"; - sha256 = "a1f76b3c3772098a7d843e955e84e4e6d41d23c197522eed23baa402de724145"; + version = "0.0.3"; + sha256 = "dd248dd26bb9ab9da3c8ce88c53a268e869b0118817f1a3ee27a5d7ad7790a52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65354,6 +65652,29 @@ self: { pname = "freer"; version = "0.2.3.0"; sha256 = "e0ef288ad5c8fc5b1ab7a50413e435648251575bb6803d41374d702fc5ad44b8"; + revision = "2"; + editedCabalFile = "39d3fcc74267e006eae237770ac8d6b7c651a927913544fb74a260ac8307beca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://gitlab.com/queertypes/freer"; + description = "Implementation of the Freer Monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "freer_0_2_4_1" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "freer"; + version = "0.2.4.1"; + sha256 = "cb01c6609c789d363fbd72df110010cfda57c6b16a8f9d5f1ae02780f764c1d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -68780,8 +69101,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.6.0.0"; - sha256 = "35b859e5a09dd12ada9cea7c343dae75500f50cd7d5ff247d5a5868d419049d6"; + version = "0.7.0.0"; + sha256 = "433c06b7c445fd9edfc081720ab51f9ced41994f481d66d4ce181df583efda38"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -68810,8 +69131,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.6.0.0"; - sha256 = "92dea9556a700d8473b0657f80228868194984dd9edb3405cd11f58939d81e5a"; + version = "0.7.0.0"; + sha256 = "5359536c791cfaf24fb8a5884d30cc117ad869ab773b977293d6424b52520a2d"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -68823,8 +69144,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.6.0.0"; - sha256 = "cf65462c0b94e3d2b21efc78dd60e90e147767a0b9719a7542f4a040dc00e60d"; + version = "0.7.0.0"; + sha256 = "da1532bf854bc9d0ae311dd1b1f14900f1258e6e29884b8c35c9326c55811ed9"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -69818,7 +70139,7 @@ self: { "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit2gtk-web-extension + , text, transformers, webkit2gtk-web-extension, webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -69829,13 +70150,14 @@ self: { base bytestring containers gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk-web-extension ]; + libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk-web-extension = null;}; + }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -71736,8 +72058,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.19"; - sha256 = "4cf869138bb7a748ccfb0d084ed53ddb19930793da39c0a45065d14e5251013b"; + version = "0.1.20"; + sha256 = "217adfa4568c7099c722e519399a56c930ae23c48cc49bed1947368e8d48c043"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79311,6 +79633,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hamilton" = callPackage + ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers + , free, hmatrix, hmatrix-gsl, optparse-applicative + , typelits-witnesses, vector, vector-sized, vty + }: + mkDerivation { + pname = "hamilton"; + version = "0.1.0.0"; + sha256 = "2c8653d3272e7fa59bfef888771ebafb8e265ba10ee03cdb8b73b5bc3bcf98d7"; + revision = "2"; + editedCabalFile = "f0a9099cd8474b2fff95c7f027c10b6a3cc43cce1be1a7bebf6914b4a2c2a49d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base comonad free hmatrix hmatrix-gsl typelits-witnesses + vector-sized + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers hmatrix optparse-applicative vector + vector-sized vty + ]; + homepage = "https://github.com/mstksg/hamilton"; + description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hamlet" = callPackage ({ mkDerivation, base, shakespeare }: mkDerivation { @@ -84252,8 +84600,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "0.4.0.1"; - sha256 = "15bc6c2ed641b3c1f1e8f8cfc377fe5ae8ec3e1f4a8eb03be8e154f981cfd6a3"; + version = "0.4.0.2"; + sha256 = "272b50d432da234803d7a590530ae87266de1f3f75b6d98bdbc53262183fd634"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84589,27 +84937,27 @@ self: { "hbro" = callPackage ({ mkDerivation, base, bytestring, chunked-data, cond, containers , data-default-class, directory, dyre, errors, fast-logger - , filepath, glib, gtk3, lens, lifted-async, lifted-base - , monad-control, monad-logger, monadIO, mono-traversable, mtl - , network-uri, optparse-applicative, pango, parsec, process, random - , resourcet, safe, safe-exceptions, semigroups, stm-chans, text - , time, transformers, transformers-base, unix, uuid, webkitgtk3 - , zeromq4-haskell + , filepath, glib, gtk3, lifted-async, lifted-base + , microlens-platform, monad-control, monad-logger, monadIO + , mono-traversable, mtl, network-uri, optparse-applicative, pango + , parsec, process, random, resourcet, safe, safe-exceptions + , semigroups, stm-chans, template-haskell, text, time, transformers + , transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.6.0.0"; - sha256 = "0572d35613f0b6e199f563375fb71991fe46ebfa7881bcee591a2054629febce"; + version = "1.7.0.0"; + sha256 = "f00f064cfe00d662b32d93ab3ae4fca204ae0cab44f115b6ef0be0f44e02a36f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring chunked-data cond containers data-default-class - directory dyre errors fast-logger filepath glib gtk3 lens - lifted-async lifted-base monad-control monad-logger monadIO + directory dyre errors fast-logger filepath glib gtk3 lifted-async + lifted-base microlens-platform monad-control monad-logger monadIO mono-traversable mtl network-uri optparse-applicative pango parsec process random resourcet safe safe-exceptions semigroups stm-chans - text time transformers transformers-base unix uuid webkitgtk3 - zeromq4-haskell + template-haskell text time transformers transformers-base unix uuid + webkitgtk3 zeromq4-haskell ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/k0ral/hbro"; @@ -84621,17 +84969,25 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , chunked-data, containers, directory, filepath, glib, gtk3, hbro - , lens, monad-control, mono-traversable, mtl, network-uri, pango - , parsec, process, resourcet, safe, safe-exceptions, text, time - , transformers-base, unix, webkitgtk3 + , microlens, monad-control, mono-traversable, mtl, network-uri + , pango, parsec, process, resourcet, safe, safe-exceptions, text + , time, transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.6.0.0"; - sha256 = "7ca63236aa588f4ac538ffb17840fca1039c36eefb2f56317b1614170c9b1603"; + version = "1.7.0.0"; + sha256 = "55398cdfcc3b0437d57798765fd5b04253d7d20e05b4c4f56a7d670832659508"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring chunked-data containers - directory filepath glib gtk3 hbro lens monad-control + directory filepath glib gtk3 hbro microlens monad-control + mono-traversable mtl network-uri pango parsec process resourcet + safe safe-exceptions text time transformers-base unix webkitgtk3 + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring chunked-data containers + directory filepath glib gtk3 hbro microlens monad-control mono-traversable mtl network-uri pango parsec process resourcet safe safe-exceptions text time transformers-base unix webkitgtk3 ]; @@ -86286,8 +86642,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.0.1"; - sha256 = "f25a727b6df685596b78d1a82c60da8433b3afb8a3c0766ece241700578fa5b7"; + version = "1.0.1.0"; + sha256 = "9b13428f919b3df7fd7f6f4012826223370951065f0fb020ae57a80810368103"; libraryHaskellDepends = [ base blaze-html blaze-markup containers parsec shakespeare template-haskell text @@ -87537,32 +87893,6 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, containers, descriptive, directory, ghc-prim - , haskell-src-exts, hspec, monad-loops, mtl, text, transformers - }: - mkDerivation { - pname = "hindent"; - version = "4.6.4"; - sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf"; - revision = "3"; - editedCabalFile = "86ebc305942be9a659bdd7a9f66771d74e72825816c6ba1f0dd29a65ce8eef35"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers haskell-src-exts monad-loops mtl text transformers - ]; - executableHaskellDepends = [ - base descriptive directory ghc-prim haskell-src-exts text - ]; - testHaskellDepends = [ - base directory haskell-src-exts hspec monad-loops mtl text - ]; - homepage = "http://www.github.com/chrisdone/hindent"; - description = "Extensible Haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hindent_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, descriptive , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec , monad-loops, mtl, path, path-io, text, transformers, unix-compat @@ -87590,7 +87920,6 @@ self: { homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hindley-milner" = callPackage @@ -88791,15 +89120,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_37" = callPackage + "hlint_1_9_38" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate }: mkDerivation { pname = "hlint"; - version = "1.9.37"; - sha256 = "a208466a837b58159d6a4bbd4c360ae918da306fb38630eae52ba5ef0c88c415"; + version = "1.9.38"; + sha256 = "43131e26bfcca9fa9dab0f4fd3a260d895586d57b871ee886f124ad1d41f989d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90282,8 +90611,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.4"; - sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665"; + version = "5.0.5"; + sha256 = "d5b6f897ddd63f037ae9ce09c4f671e95a7f4331add3c09bd2bbd29114a89bb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93955,8 +94284,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.2.9"; - sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0"; + version = "0.3.0"; + sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -95748,8 +96077,8 @@ self: { ({ mkDerivation, attoparsec, base, deepseq, text }: mkDerivation { pname = "html-parse"; - version = "0.1.0.0"; - sha256 = "077760e09e7ea180b786d6379b725419f9e892579a53d7469d1c09e48d7af000"; + version = "0.2.0.0"; + sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92"; libraryHaskellDepends = [ attoparsec base deepseq text ]; homepage = "http://github.com/bgamari/html-parse"; description = "A high-performance HTML tokenizer"; @@ -95835,6 +96164,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htn" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "htn"; + version = "0.1.0.0"; + sha256 = "13f49c161f754d3bac7a08227b949c7a34c7658f22476fcc99f26c0d8e673ce5"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/y-kamiya/htn-haskell#readme"; + description = "resolver using htn algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htodo" = callPackage ({ mkDerivation, base, HDBC, HDBC-sqlite3 }: mkDerivation { @@ -104357,17 +104699,19 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , http-types, lens, primitive, process, ref-tf, stm - , template-haskell, text, time, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, filepath, ghc-prim, http-types, lens, primitive, process + , ref-tf, scientific, stm, template-haskell, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.6.0.1"; - sha256 = "16bca9ea2c962ecaeb42961b9795de61504f1c214a20d189c3e3483cdbc557e1"; + version = "0.7.0.0"; + sha256 = "bfbf63663129551b95efc44333e944dd56357ea4e0778b592701480836511554"; libraryHaskellDepends = [ - aeson base bytestring containers filepath http-types lens primitive - process ref-tf stm template-haskell text time transformers + aeson attoparsec base bytestring containers deepseq filepath + ghc-prim http-types lens primitive process ref-tf scientific stm + template-haskell text time transformers unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104380,8 +104724,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.6.0.0"; - sha256 = "ef270104ea9a4eef9eca156bd2406f1ad453f1d7543e9dc3054d4549e8a85e37"; + version = "0.7.0.0"; + sha256 = "0315258fbf5a1ce449de3df26d53de1d3e569ad4604bd17697983629fc183f82"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -104406,22 +104750,22 @@ self: { }) {}; "jsaddle-warp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , filepath, http-types, jsaddle, lens, primitive, process - , QuickCheck, ref-tf, stm, text, time, transformers, wai + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive + , process, QuickCheck, ref-tf, stm, text, time, transformers, wai , wai-websockets, warp, websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.6.0.1"; - sha256 = "c91ba8f83df56044247ee8deadec3889346c640b069efed2b8035162e8c4cfc0"; + version = "0.7.0.0"; + sha256 = "5f847b737fc542f9b5f8a0b3aa3a384b18d588fd5433cffbc279c7aac52de818"; libraryHaskellDepends = [ aeson base containers http-types jsaddle stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ - base bytestring doctest filepath jsaddle lens primitive process - QuickCheck ref-tf + base bytestring deepseq doctest filepath ghc-prim jsaddle lens + primitive process QuickCheck ref-tf ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104432,8 +104776,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, jsaddle }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.6.0.0"; - sha256 = "cedc6b826bc2b07841aed149ecf3ad3c39f5ed75964f3ea49e0ee3c445b5373c"; + version = "0.7.0.0"; + sha256 = "fa9a722cab4659f00acdad3c50d70b6ecbaf8d457fcc50c44191a60802f8c26d"; libraryHaskellDepends = [ aeson base bytestring jsaddle ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104706,10 +105050,8 @@ self: { }: mkDerivation { pname = "json-extra"; - version = "0.1.0.1"; - sha256 = "7a3a70ea9e1f4c9538a91563446ec0bcdfe6c10967b116fbe9b1ca99173216f3"; - revision = "1"; - editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741"; + version = "0.2.0.0"; + sha256 = "f8d8c1721f148ff2c3ed02a55944804cf050fcec3587935a0e076fc61c608a93"; libraryHaskellDepends = [ aeson base bytestring data-default template-haskell unordered-containers yaml @@ -106877,6 +107219,8 @@ self: { pname = "kqueue"; version = "0.2"; sha256 = "700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369"; + revision = "1"; + editedCabalFile = "cea5494eb8fc333d8f9d35768eea1c813620f39e35f1a37feae1811aa57b9850"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://github.com/hesselink/kqueue"; @@ -107291,6 +107635,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lambda-sampler" = callPackage + ({ mkDerivation, base, MonadRandom, mtl, QuickCheck, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lambda-sampler"; + version = "1.0"; + sha256 = "caa0d9284dc39ca81a8ff86e4c675d24937dbbe7b6298d9c0aa13524e12d1af2"; + libraryHaskellDepends = [ base MonadRandom mtl transformers ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "https://github.com/maciej-bendkowski/lambda-sampler"; + description = "Boltzmann sampler utilities for lambda calculus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lambda-toolbox" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -109026,6 +109387,8 @@ self: { pname = "latex-function-tables"; version = "0.1.0.0"; sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4"; + revision = "1"; + editedCabalFile = "6bd3bb245f08cc610e07279a310ae99bd37ee797fda60c6fc84b13c9fb38bf83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109034,7 +109397,7 @@ self: { ]; executableHaskellDepends = [ base HaTeX process template-haskell ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/githubuser/nfm2017#readme"; + homepage = "https://github.com/unitb/latex-function-tables"; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -110635,6 +110998,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libmolude" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, binary + , bytestring, concurrent-machines, containers + , containers-unicode-symbols, contravariant, data-textual + , directory, exceptions, filepath, hjsonschema, lens, machines, mtl + , parsers, path, path-io, protolude, QuickCheck, random, semigroups + , stm, stm-containers, temporary, test-framework + , test-framework-quickcheck2, test-framework-th, text, text-icu + , text-icu-normalized, text-printer, time, transformers, yaml + , zippers + }: + mkDerivation { + pname = "libmolude"; + version = "0.12.3"; + sha256 = "4914c6c7dbbf08d5ab03498654d096ee3b21385ecb5be5e2574b05215b2f55b2"; + libraryHaskellDepends = [ + aeson base base-unicode-symbols binary bytestring + concurrent-machines containers containers-unicode-symbols + contravariant data-textual directory exceptions filepath + hjsonschema lens machines mtl parsers path path-io protolude random + semigroups stm stm-containers temporary text text-icu + text-icu-normalized text-printer time transformers yaml zippers + ]; + testHaskellDepends = [ + base binary bytestring exceptions filepath QuickCheck semigroups + temporary test-framework test-framework-quickcheck2 + test-framework-th text time transformers + ]; + description = "Prelude based on protolude for GHC 8 and beyond"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, filepath, hspec, mtl, network, old-locale @@ -111331,6 +111726,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "line" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, http-types, lens, text, time, transformers + , wai, wreq + }: + mkDerivation { + pname = "line"; + version = "1.0.0.1"; + sha256 = "f4cdfb7531f722143c20ee7a52655ec0a5c776777a45f9a9b653e2ff9910d9d6"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 + http-types lens text time transformers wai wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/noraesae/line"; + description = "Haskell SDK for the LINE API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -113180,22 +113594,17 @@ self: { }) {}; "log" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, deepseq, exceptions, hpqtypes - , http-client, http-types, lifted-base, monad-control, monad-time - , mtl, old-locale, process, random, semigroups, split, stm, tasty - , tasty-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector + ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions + , http-client, http-types, log-base, log-elasticsearch + , log-postgres, process, random, tasty, tasty-hunit, text, time + , transformers }: mkDerivation { pname = "log"; - version = "0.6"; - sha256 = "7b059a5130d7a7ec87109bdb118223ba281135ccdbc68551ff4123da4181176a"; + version = "0.7"; + sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b"; libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bloodhound bytestring - deepseq exceptions hpqtypes http-client lifted-base monad-control - monad-time mtl old-locale semigroups split stm text text-show time - transformers transformers-base unordered-containers vector + base log-base log-elasticsearch log-postgres ]; testHaskellDepends = [ aeson base bloodhound bytestring exceptions http-client http-types @@ -113207,6 +113616,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-base" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, monad-control, monad-time, mtl, semigroups, stm, text + , time, transformers-base, unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.7"; + sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions monad-control + monad-time mtl semigroups stm text time transformers-base + unordered-containers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving @@ -113249,6 +113677,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-elasticsearch" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, log-base + , semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.7"; + sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client log-base semigroups text text-show time + transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "log-postgres" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base + , mtl, semigroups, split, text, text-show, time + , unordered-containers, vector + }: + mkDerivation { + pname = "log-postgres"; + version = "0.7"; + sha256 = "33744eff195af018d2cf9fa2ce6617ce3cf5242cf478fea776e4a9db7a74f963"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring deepseq + hpqtypes http-client lifted-base log-base mtl semigroups split text + text-show time unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (PostgreSQL back end)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config @@ -115636,12 +116104,17 @@ self: { }) {}; "manifold-random" = callPackage - ({ mkDerivation, base, manifolds, random-fu, vector-space }: + ({ mkDerivation, base, constrained-categories, linearmap-category + , manifolds, random-fu, semigroups, vector-space + }: mkDerivation { pname = "manifold-random"; - version = "0.1.1.0"; - sha256 = "9979681fcea7a314db619da04ffca77c93d5afe42ce0b819bd974ca70e74050c"; - libraryHaskellDepends = [ base manifolds random-fu vector-space ]; + version = "0.3.0.0"; + sha256 = "1ea6a797e4325a16d4a4c7f59d2f732a5c5796491dad79a2b82db3a84feaf369"; + libraryHaskellDepends = [ + base constrained-categories linearmap-category manifolds random-fu + semigroups vector-space + ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; @@ -116715,8 +117188,8 @@ self: { ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { pname = "median-stream"; - version = "0.6.0.0"; - sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d"; + version = "0.7.0.0"; + sha256 = "e92fc44be8189dafe9190aad225462780f26d0b1fe1823376342329db6c71f3d"; libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/caneroj1/median-stream#readme"; @@ -118749,6 +119222,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "model" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike + , pretty, tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "model"; + version = "0.2.1"; + sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d"; + libraryHaskellDepends = [ + base containers deepseq ListLike pretty transformers + ]; + testHaskellDepends = [ + base containers ghc-prim pretty tasty tasty-hunit tasty-quickcheck + ]; + homepage = "http://github.com/tittoassini/model"; + description = "Derive a model of a data type using Generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "modelicaparser" = callPackage ({ mkDerivation, ansi-terminal, base, containers, filepath, parsec , QuickCheck @@ -121807,9 +122299,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "multirec"; - version = "0.7.6"; - sha256 = "5212ab1014ccf58472c831fd203e2218073aea213f9f3cc80acafef0458afc27"; + version = "0.7.7"; + sha256 = "f342653e874db55f673e6d6236a2c21cc815d5e999ce62affe54fc99a49362e7"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; @@ -126550,22 +127043,24 @@ self: { "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Decimal - , hlint, hspec, HUnit, lens, old-locale, scientific, text, time - , vector, wreq + , hlint, hspec, http-conduit, HUnit, lens, old-locale, scientific + , text, thyme, vector }: mkDerivation { pname = "oanda-rest-api"; - version = "0.1.0.0"; - sha256 = "7a22fbe550d0bd7d80d9a07e4e563557ff81f294eef423026542bc2bd8a18b0f"; + version = "0.3.0.0"; + sha256 = "be57364a4da2e2b20d188c8a50efe15b4a07daf641e4294e3b9eba87b75f7603"; + revision = "1"; + editedCabalFile = "44db3924a18face1edc0b9c6ee19c0ed2bc0d0441a123286bb099bfac663d1d5"; libraryHaskellDepends = [ - aeson base bytestring containers Decimal lens old-locale scientific - text time vector wreq + aeson base bytestring containers Decimal http-conduit lens + old-locale scientific text thyme vector ]; testHaskellDepends = [ - aeson base bytestring containers Decimal hlint hspec HUnit lens - old-locale scientific text time vector wreq + aeson base bytestring containers Decimal hlint hspec http-conduit + HUnit lens old-locale scientific text thyme vector ]; - homepage = "http://github.com/jdreaver/oanda-rest-api"; + homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; description = "Client to the OANDA REST API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127387,6 +127882,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.2.2"; + sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -133314,8 +133836,8 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_11" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, either, hspec + "pinboard_0_9_12_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions , semigroups, text, time, transformers, unordered-containers @@ -133323,10 +133845,10 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.11"; - sha256 = "2fc06cd5f9afb134802d9777cb53052066eb7ee9b3fa6f24b7eb12907146f774"; + version = "0.9.12.1"; + sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237"; libraryHaskellDepends = [ - aeson base bytestring containers either http-client http-client-tls + aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random safe-exceptions text time transformers unordered-containers vector ]; @@ -136913,20 +137435,22 @@ self: { }) {}; "pregame" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, containers - , data-default, lens, mtl, parallel, safe, stm, text, transformers - , tuple, vector + ({ mkDerivation, aeson, array, base, bytestring, containers + , data-default, deepseq, either, ghc-prim, integer-gmp, lens, mtl + , safe, stm, text, text-conversions, time, tuple + , unordered-containers, vector }: mkDerivation { pname = "pregame"; - version = "0.1.4.3"; - sha256 = "c46be43886c12e04954a7674ea4fbc8be0f79a75d19effb9b420d41e5e754253"; + version = "1.0.1.0"; + sha256 = "218237f29e51e0635845008541629efc4fcc66403b90c4401087e5279871a9f4"; libraryHaskellDepends = [ - base bytestring cmdargs containers data-default lens mtl parallel - safe stm text transformers tuple vector + aeson array base bytestring containers data-default deepseq either + ghc-prim integer-gmp lens mtl safe stm text text-conversions time + tuple unordered-containers vector ]; homepage = "https://github.com/jxv/pregame"; - description = "Prelude counterpart"; + description = "Prelude for applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137214,8 +137738,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: mkDerivation { pname = "pretty-display"; - version = "0.1.9"; - sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c"; + version = "0.1.10"; + sha256 = "7dd446519a316ebd9b33f3d6fc61603d73ffba1f6dd3ed6ada79bd9c8a043406"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base pretty-show text ]; @@ -139370,19 +139894,19 @@ self: { }) {}; "pure-zlib" = callPackage - ({ mkDerivation, base, base-compat, bytestring, bytestring-builder - , containers, filepath, fingertree, HUnit, monadLib, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, array, base, base-compat, bytestring + , bytestring-builder, containers, filepath, fingertree, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "pure-zlib"; - version = "0.5"; - sha256 = "b7cf6e9d02c9ab7d246651b4a49696448dd35cbd2146ace84ff4a9ea5afc30ab"; + version = "0.6"; + sha256 = "ab7814fbef5bfa299d3c9e3f7c614a20d3a2600b85807ee7284e235ada78ebc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring bytestring-builder containers - fingertree monadLib + array base base-compat bytestring bytestring-builder containers + fingertree ]; executableHaskellDepends = [ base base-compat bytestring ]; testHaskellDepends = [ @@ -140648,6 +141172,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-string-random" = callPackage + ({ mkDerivation, base, QuickCheck, string-random, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "quickcheck-string-random"; + version = "0.1.0.0"; + sha256 = "dec015a4dabc4f6b63926502b11c0882272b1282d341a9d39e69033974d9eb12"; + libraryHaskellDepends = [ base QuickCheck string-random text ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck text + ]; + homepage = "https://github.com/hiratara/hs-string-random#readme"; + description = "Helper to build generators with Text.StringRandom"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-text" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: mkDerivation { @@ -140836,8 +141377,8 @@ self: { }: mkDerivation { pname = "quiver-binary"; - version = "0.1.1.0"; - sha256 = "44e9190ce2a87135e85b98d6843ce74b15710537e7dd56524ecb731181fb162a"; + version = "0.1.1.1"; + sha256 = "d9a1b83fc011daa5ecc5f29615aa338f44df78d375d6a9d7d2548b8289115832"; libraryHaskellDepends = [ base binary bytestring quiver quiver-bytestring ]; @@ -140934,8 +141475,8 @@ self: { }: mkDerivation { pname = "quiver-instances"; - version = "0.2.0.0"; - sha256 = "00acef0be95c1aad3a0cc56fa6281a794e9375ba25def925370b9bc77eecd90d"; + version = "0.2.0.1"; + sha256 = "4365f1cd79585fbecfd9e3f20be97c6cbe41b70dc543a513eed8e97bc53f2ca3"; libraryHaskellDepends = [ base exceptions quiver resourcet transformers transformers-base ]; @@ -140948,8 +141489,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, quiver }: mkDerivation { pname = "quiver-interleave"; - version = "0.2.0.1"; - sha256 = "0dbe071064fdffb6995475048afe2531096e4009243fe58fc9bfe6ed31f2dad8"; + version = "0.2.0.2"; + sha256 = "4648939ed31c08f22b8c0c9be84e826ba4ce964525ee9cdd25c76d618612beaf"; libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Interleave values from multiple Quivers"; @@ -140965,8 +141506,8 @@ self: { }: mkDerivation { pname = "quiver-sort"; - version = "0.2.0.0"; - sha256 = "78dba51aa22ecc34e7d871d066bd936febcb684dd20679d46ba2cd377399ee0c"; + version = "0.2.0.1"; + sha256 = "0d181443faa5b577b6f2483af3a51bb1572ea4f5d81000d78ceddd480c51a961"; libraryHaskellDepends = [ base containers directory exceptions quiver quiver-binary quiver-bytestring quiver-groups quiver-instances quiver-interleave @@ -142254,8 +142795,8 @@ self: { ({ mkDerivation, aeson, base, react-flux, servant, text }: mkDerivation { pname = "react-flux-servant"; - version = "0.1.0"; - sha256 = "9dac8c127094cb3ddfded25f5b79f2da46f3f8cd5e6aa58c552b55d341ced901"; + version = "0.1.1"; + sha256 = "04931915c2a2afa50effe3e40d4c61dc6e9e6c7c0f7eb834670b9de6054c389c"; libraryHaskellDepends = [ aeson base react-flux servant text ]; homepage = "https://bitbucket.org/wuzzeb/react-flux-servant"; description = "Allow react-flux stores to send requests to a servant server"; @@ -142794,6 +143335,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_0_6" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.0.6"; + sha256 = "dcf4217ab3f089a8934808af88d95e6d8e57bd57fac3cce54d8b048232abfa01"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -145435,6 +145999,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rerebase" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.0.1"; + sha256 = "8cc418b668b575382ef5a977b06de3475c5ab92c3ed47174c94ef98bdbf13205"; + libraryHaskellDepends = [ rebase ]; + homepage = "https://github.com/nikita-volkov/rerebase"; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl , path-pieces, text, unordered-containers, vector @@ -145780,8 +146356,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "2"; - editedCabalFile = "9eb0c067b4a15b128d75c240694fc31504664107c88b9b80f925ef669eac632a"; + revision = "3"; + editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -146071,6 +146647,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_4_2" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.4.2"; + sha256 = "521b392570b37b17ac8aaea2586a0a16a578f56b9cd0bbf69813b35f7ed2b47c"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hspec HUnit mtl + QuickCheck random stm time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -151172,10 +151769,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.1.1"; - sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; - revision = "1"; - editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85"; + version = "0.1.2.0"; + sha256 = "7dfa3165d4edb739c33e7d737b5655535ae28666f9d3886501ed623f28c6e15e"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -153867,8 +154462,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.1.2"; - sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817"; + version = "0.1.3"; + sha256 = "73d50978e7b6a0c1d1784ab607572411da44aafce58defe45938f2b427b85713"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob unordered-containers @@ -155836,6 +156431,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "slope-field" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, colour + , data-default-class, lens, mathexpr + }: + mkDerivation { + pname = "slope-field"; + version = "0.1.0.1"; + sha256 = "51c49a88ceb3fd3ec77670e32950a18fe1e185a79820228bb231b4f0d13a29af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base data-default-class mathexpr ]; + executableHaskellDepends = [ + base Chart Chart-cairo colour data-default-class lens + ]; + homepage = "https://github.com/mdibaiee/slope-field"; + description = "Visualize mathematical function's slope fields"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "slot-lambda" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, syb, template-haskell, vector @@ -157180,6 +157794,8 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.0.1.0"; sha256 = "c747f9a0145c22f36441bab504a45ab20fc68ad46a8383c5f4db6686cd0dee7d"; + revision = "1"; + editedCabalFile = "94e77c56c9493373c7d57f50b6dc62e178cf37d294aa046bd66f71f6102b3372"; libraryHaskellDepends = [ base bytestring clientsession configurator lens lifted-base monad-control mtl postgresql-simple resource-pool snap text @@ -157828,6 +158444,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "soap_0_2_3_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, configurator + , data-default, exceptions, hspec, http-client, http-types, HUnit + , iconv, mtl, resourcet, text, unordered-containers, xml-conduit + , xml-conduit-writer, xml-types + }: + mkDerivation { + pname = "soap"; + version = "0.2.3.2"; + sha256 = "e7e5d21f70d67f14806a44f7328350d0f06b39ad4cbbc5a514437c5ddfb95395"; + libraryHaskellDepends = [ + base bytestring conduit configurator data-default exceptions + http-client http-types iconv mtl resourcet text + unordered-containers xml-conduit xml-conduit-writer xml-types + ]; + testHaskellDepends = [ + base bytestring hspec HUnit text unordered-containers xml-conduit + xml-conduit-writer + ]; + homepage = "https://bitbucket.org/dpwiz/haskell-soap"; + description = "SOAP client tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soap-openssl" = callPackage ({ mkDerivation, base, configurator, data-default, HsOpenSSL , http-client, http-client-openssl, soap, text @@ -157958,8 +158599,8 @@ self: { ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; - version = "0.2.0.1"; - sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036"; + version = "0.3.0.0"; + sha256 = "3320909a90d21f51743a114dd3f69604c7490ce1e86242f280cae8bc7c45092c"; libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; @@ -159274,8 +159915,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.90.1"; - sha256 = "5feb5f23458155f317808992af1de5cb1e86ee6d89a0ce0371efe3dfd130926b"; + version = "1.91.0"; + sha256 = "cfa966eddf2336a000d26cf6d4234529dddabeb8d87cadd51e7a5d2e5e794738"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161674,22 +162315,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_2_0" = callPackage + "stratosphere_0_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text + , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.2.0"; - sha256 = "7a5b78bbcf125e5fec7e377ddb6917111341bab23a7bf5567e1393a910f9085e"; + version = "0.2.2"; + sha256 = "e7f212a1dad585810e72adbf572b4324a5bfbc4fe7ace581c613fa668bc24ed1"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers + aeson aeson-pretty base bytestring hashable lens template-haskell + text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers + aeson aeson-pretty base bytestring directory hashable hlint lens + tasty tasty-hspec template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -162261,6 +162902,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-random" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , pcre-heavy, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "string-random"; + version = "0.1.0.0"; + sha256 = "501904563b2dc7466568822e6b95e152d2e6e61818717b3963fd78b0888d1424"; + libraryHaskellDepends = [ + attoparsec base containers random text transformers + ]; + testHaskellDepends = [ + base bytestring pcre-heavy QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "https://github.com/hiratara/hs-string-random#readme"; + description = "A library for generating random string from a regular experession"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-similarity" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }: mkDerivation { @@ -166281,8 +166943,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.1.1"; - sha256 = "2d253937a83605fd947a0d68d86208f0801bef97bf45679c81528d6c4d4e5d1d"; + version = "0.5.1.2"; + sha256 = "f13c9ce45a3d3a7bf52f4fadd8e1410ba64e3015ace00a6f82b2d4adf7e2410c"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -170196,6 +170858,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timezone-unix" = callPackage + ({ mkDerivation, base, directory, filepath, leapseconds, tasty + , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series + , unix + }: + mkDerivation { + pname = "timezone-unix"; + version = "1.0"; + sha256 = "d23f524eb3738a0ee21a168bb56e8dfe85e602edc80268027358deddae63c0ba"; + libraryHaskellDepends = [ + base directory filepath leapseconds time timezone-olson + timezone-series unix + ]; + testHaskellDepends = [ + base directory leapseconds tasty tasty-golden tasty-hunit time + timezone-series + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timing-convenience" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -171404,6 +172086,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient-universe_0_3_5_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.3.5.1"; + sha256 = "7613bf9a99b111423649793f687b7a2b81241b89840a8046a316793ecc7df985"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + executableHaskellDepends = [ base transformers transient ]; + testHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -171746,6 +172458,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_1_6_1" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base + , blaze-builder, blaze-html, blaze-markup, bytestring, charset + , comonad, containers, deepseq, directory, doctest, filepath + , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors + , QuickCheck, reducers, semigroups, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "1.6.1"; + sha256 = "854c2892ffddfa5315206a1ff94b4814517933c496acf5b7ae09fdde72a28cf7"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html + blaze-markup bytestring charset comonad containers deepseq + fingertree ghc-prim hashable lens mtl parsers profunctors reducers + semigroups transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base directory doctest filepath parsers QuickCheck + ]; + homepage = "http://github.com/ekmett/trifecta/"; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -175707,6 +176446,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_2_2_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , containers, generics-sop, HUnit, lens-simple, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.2.2.1"; + sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring containers generics-sop + HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -176787,6 +177550,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_0_5_4" = callPackage + ({ mkDerivation, base, bifunctors, directory, doctest, filepath + , lens, mtl, QuickCheck, semigroupoids, semigroups + , template-haskell, transformers + }: + mkDerivation { + pname = "validation"; + version = "0.5.4"; + sha256 = "8b785f5d9e35285b2fbc35039799410bf3a9c7179735c232e573485cb98f74a3"; + libraryHaskellDepends = [ + base bifunctors lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/NICTA/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -177544,8 +178328,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.4.0.1"; - sha256 = "88880ec1fafecf2ef3ab545c43ff3256a32dc7dd854eec4aaa0d6bd4afd7b008"; + version = "0.4.1.0"; + sha256 = "19205fe36c63edfc52ea0f057bdf13ac22c71f5e40afc666bc9c6ff20846ca39"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -181360,6 +182144,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wikicfp-scraper_0_1_0_6" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec + , scalpel, text, time + }: + mkDerivation { + pname = "wikicfp-scraper"; + version = "0.1.0.6"; + sha256 = "8da3d67ee089342a9057e08b350896f278d404466e771757412ddcf1117270eb"; + libraryHaskellDepends = [ + attoparsec base bytestring scalpel text time + ]; + testHaskellDepends = [ base bytestring filepath hspec time ]; + homepage = "https://github.com/debug-ito/wikicfp-scraper"; + description = "Scrape WikiCFP web site"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -181437,8 +182239,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.2"; - sha256 = "dd31ca0fff07e5976076ed092ffb261ca438240fa33b25ba5ec3de66dcfd6d2d"; + version = "0.1.0.3"; + sha256 = "1eed4881d43da9a4169f338d5b503269df8c4c5f92e6da08a12282f2c17f9a36"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -182333,6 +183135,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-mtl_0_1_1_0" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.1.0"; + sha256 = "c8c17d4112fc851d3b48fd52ee1c5dc44c29b0e85dec73ddc8fa9a2415e99dd3"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -182347,6 +183165,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-transformers_0_1_1_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "writer-cps-transformers"; + version = "0.1.1.0"; + sha256 = "0a8663fe10576b659955fc3f9f816c776cc3a2cd9620e907d0e9ca1a8e88c62e"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/minad/writer-cps-transformers#readme"; + description = "WriteT and RWST monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wsdl" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types From 1e62dc2929f2722d9d31810edd8fc887315f79d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2016 20:28:05 +0100 Subject: [PATCH 061/219] configuration-hackage2nix.yaml: use latest hindent --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 832451138ee..ab42bbd0836 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -844,7 +844,6 @@ default-package-overrides: - hidapi ==0.1.4 - hierarchical-clustering ==0.4.6 - highlighting-kate ==0.6.3 - - hindent ==4.6.4 - hinotify ==0.3.8.1 - hint ==0.6.0 - histogram-fill ==0.8.4.1 From 725e44cc046aaa8723f78ab420012db360eff11c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 24 Nov 2016 19:17:46 -0500 Subject: [PATCH 062/219] hindent: fix 5.2.1 build --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f521f310050..85970c88851 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -807,7 +807,7 @@ self: super: { }; # # Make elisp files available at a location where people expect it. - hindent = overrideCabal super.hindent (drv: { + hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' @@ -816,7 +816,9 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - }); + })).override { + haskell-src-exts = self.haskell-src-exts_1_19_0; + }; # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108 From d24a886419ce40e79daaf1f910a5bc861db4db0b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 25 Nov 2016 13:48:21 -0500 Subject: [PATCH 063/219] hoogle: build with newest haskell-src-exts --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85970c88851..8a8d0e84e76 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -988,7 +988,7 @@ self: super: { }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; # To be in sync with Hoogle. lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { From bbd39a8057a4cfd32ac6db41ac922804dcf6dd5e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 17:07:01 +0100 Subject: [PATCH 064/219] fbida: 2.11 -> 2.12 --- pkgs/applications/graphics/fbida/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 65209cbd6ff..75033cf0f9d 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends -}: +, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm +, epoxy, poppler }: stdenv.mkDerivation rec { - name = "fbida-2.11"; + name = "fbida-2.12"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "00x1lppb66b0gvp6sqs7zjgnlfh80lnkwvsm15ifzvlss3b67akw"; + sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = - [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp - imagemagick curl sane-backends libdrm - ]; + buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff + libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; @@ -34,6 +32,6 @@ stdenv.mkDerivation rec { homepage = https://www.kraxel.org/blog/linux/fbida/; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From bcc9a6ac75d87738bae8dac55d074e1c5b9f9201 Mon Sep 17 00:00:00 2001 From: pngwjpgh Date: Sun, 27 Nov 2016 17:23:21 +0100 Subject: [PATCH 065/219] infinoted service: init Service module for the dedicated gobby server included in libinfinity --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/editors/infinoted.nix | 158 +++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 nixos/modules/services/editors/infinoted.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b61c1f4799e..41ee63a9603 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -281,6 +281,7 @@ ipfs = 261; stanchion = 262; riak-cs = 263; + infinoted = 264; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -532,6 +533,7 @@ ipfs = 261; stanchion = 262; riak-cs = 263; + infinoted = 264; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4589f47e7c1..12ff1cac4f4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -180,6 +180,7 @@ ./services/desktops/telepathy.nix ./services/development/hoogle.nix ./services/editors/emacs.nix + ./services/editors/infinoted.nix ./services/games/factorio.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix new file mode 100644 index 00000000000..963147b18a0 --- /dev/null +++ b/nixos/modules/services/editors/infinoted.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.infinoted; +in { + options.services.infinoted = { + enable = mkEnableOption "infinoted"; + + package = mkOption { + type = types.package; + default = pkgs.libinfinity.override { daemon = true; }; + defaultText = "pkgs.libinfinity.override { daemon = true; }"; + description = '' + Package providing infinoted + ''; + }; + + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Private key to use for TLS + ''; + }; + + certificateFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Server certificate to use for TLS + ''; + }; + + certificateChain = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Chain of CA-certificates to which our `certificateFile` is relative. + Optional for TLS. + ''; + }; + + securityPolicy = mkOption { + type = types.enum ["no-tls" "allow-tls" "require-tls"]; + default = "require-tls"; + description = '' + How strictly to enforce clients connection with TLS. + ''; + }; + + port = mkOption { + type = types.int; + default = 6523; + description = '' + Port to listen on + ''; + }; + + rootDirectory = mkOption { + type = types.path; + default = "/var/lib/infinoted/documents/"; + description = '' + Root of the directory structure to serve + ''; + }; + + plugins = mkOption { + type = types.listOf types.str; + default = [ "note-text" "note-chat" "logging" "autosave" ]; + description = '' + Plugins to enable + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File to read server-wide password from + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + [autosave] + interval=10 + ''; + description = '' + Additional configuration to append to infinoted.conf + ''; + }; + + user = mkOption { + type = types.str; + default = "infinoted"; + description = '' + What to call the dedicated user under which infinoted is run + ''; + }; + + group = mkOption { + type = types.str; + default = "infinoted"; + description = '' + What to call the primary group of the dedicated user under which infinoted is run + ''; + }; + }; + + config = mkIf (cfg.enable) { + users.extraUsers = optional (cfg.user == "infinoted") + { name = "infinoted"; + description = "Infinoted user"; + group = cfg.group; + }; + users.extraGroups = optional (cfg.group == "infinoted") + { name = "infinoted"; + }; + + systemd.services.infinoted = + { description = "Gobby Dedicated Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -p /var/lib/infinoted + install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf + cat >>/var/lib/infinoted/infinoted.conf < Date: Mon, 28 Nov 2016 00:23:12 +0200 Subject: [PATCH 066/219] U-Boot: 2016.05 -> 2016.11 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a87971d4d9c..e6577839718 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,11 +10,11 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2016.05"; + version = "2016.11"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0wdivib8kbm17qr6r7n7wyzg5vnwpagvwk5m0z80rbssc5sj5l47"; + sha256 = "1j6dkd9fqiibsdv0smq6q4x5zgyd4i1n4lk7prm47h6wcmjkx0a5"; }; nativeBuildInputs = [ bc dtc ]; From 25d6bfa2585b39beaeeb54a090d8e29a8787f783 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 28 Nov 2016 00:23:40 +0200 Subject: [PATCH 067/219] raspberrypifw: 1.20160620 -> 1.20161020 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 2ee232e877d..1c1b11f1ef4 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20160620"; + version = "1.20161020"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "06g691px0abndp5zvz2ba1g675rcqb64n055h5ahgnlck5cdpawg"; + sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34"; }; dontStrip = true; # Stripping breaks some of the binaries From 86ea3126bc4543cc7880aab73dc1edaffe80537e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 28 Nov 2016 00:24:00 +0200 Subject: [PATCH 068/219] linux_rpi: 1.20160620 -> 1.20161020 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index a069e7606cc..3d046ee8f59 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.4.13"; - tag = "1.20160620-1"; + modDirVersion = "4.4.26"; + tag = "1.20161020-1"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}"; - sha256 = "0bydlzmd9mar07j6dihhzn1xm6vpn92y33vf1qsdkl3hjil6brfc"; + sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5"; }; features.iwlwifi = true; From eecf76eaa23f12109fc2be64a892fcabcf8ae642 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 27 Nov 2016 19:47:34 -0500 Subject: [PATCH 069/219] linux: 4.9-rc6 -> 4.9-rc7 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ab5af38d8b6..2ae714ea089 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -367,7 +367,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") '' MLX4_EN_VXLAN y ''} - MODVERSIONS y + ${optionalString (versionOlder version "4.9") '' + MODVERSIONS y + ''} MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y NET_FC y # Fibre Channel driver support diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9979b854693..95e89005b0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc6"; - modDirVersion = "4.9.0-rc6"; + version = "4.9-rc7"; + modDirVersion = "4.9.0-rc7"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; + sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; }; features.iwlwifi = true; From 6d47cb41314a7acd220fdc83b6d173e130fb9155 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Nov 2016 23:47:02 +0100 Subject: [PATCH 070/219] skopeo: init at 0.1.16 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skopeo/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/skopeo/default.nix diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix new file mode 100644 index 00000000000..547f21a6f5d --- /dev/null +++ b/pkgs/development/tools/skopeo/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }: + +buildGoPackage rec { + name = "skopeo-${version}"; + version = "0.1.16"; + rev = "v${version}"; + + goPackagePath = "github.com/projectatomic/skopeo"; + excludedPackages = "integration"; + + buildInputs = [ gpgme ]; + + src = fetchFromGitHub { + inherit rev; + owner = "projectatomic"; + repo = "skopeo"; + sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b"; + }; + + meta = { + description = "A command line utility for various operations on container images and image repositories"; + homepage = "https://github.com/projectatomic/skopeo"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.asl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c7348979..0075b345898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11457,6 +11457,8 @@ in rcshutdown = "/etc/rc.d/rc.shutdown"; }; + skopeo = callPackage ../development/tools/skopeo { }; + smem = callPackage ../os-specific/linux/smem { }; statifier = callPackage ../os-specific/linux/statifier { }; From dfb354ea7d76bf7bf60e39a07e4a7acdbfd0d3be Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 27 Nov 2016 18:24:51 -0800 Subject: [PATCH 071/219] multi-ghc-travis: git-2015-11-04 -> git-2016-10-23 (#20754) adds support for ghc8 --- .../tools/haskell/multi-ghc-travis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index a8fa950c98d..71b363b2740 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2015-11-04"; + version = "git-2016-10-23"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "4c288937ff8b80f6f1532609f9920912856dc3ee"; - sha256 = "0978k81by403in7iq7ia4hsfwlvaalnjqyh3ihwyw8822a5gm8y9"; + rev = "03dd35f3801d6af4224906d45e982a748de9960e"; + sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi"; }; patchPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - ghc -O --make make_travis_yml.hs -o $out/bin/multi-ghc-travis + ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis ''; meta = with stdenv.lib; { From 9538176042c8f3cabdbb4aa5ffcc86b7dad3d425 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Nov 2016 03:28:40 +0100 Subject: [PATCH 072/219] sks: init at 1.1.6 (#20717) --- pkgs/servers/sks/default.nix | 45 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/servers/sks/default.nix diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix new file mode 100644 index 00000000000..9149f050655 --- /dev/null +++ b/pkgs/servers/sks/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }: + +stdenv.mkDerivation rec { + name = "sks-${version}"; + version = "1.1.6"; + + src = fetchFromBitbucket { + owner = "skskeyserver"; + repo = "sks-keyserver"; + rev = "${version}"; + sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; + }; + + buildInputs = [ ocaml zlib db48 perl ]; + + makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; + preConfigure = '' + cp Makefile.local.unused Makefile.local + sed -i \ + -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \ + Makefile.local + ''; + + preBuild = "make dep"; + + doCheck = true; + checkPhase = "./sks unit_test"; + + meta = with stdenv.lib; { + description = "An OpenPGP keyserver whose goal is to provide easy to + deploy, decentralized, and highly reliable synchronization"; + longDescription = '' + SKS is an OpenPGP keyserver whose goal is to provide easy to deploy, + decentralized, and highly reliable synchronization. That means that a key + submitted to one SKS server will quickly be distributed to all key + servers, and even wildly out-of-date servers, or servers that experience + spotty connectivity, can fully synchronize with rest of the system. + ''; + inherit (src.meta) homepage; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0075b345898..c6eab716b28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3684,6 +3684,8 @@ in skippy-xd = callPackage ../tools/X11/skippy-xd {}; + sks = callPackage ../servers/sks { }; + skydns = callPackage ../servers/skydns { }; sipcalc = callPackage ../tools/networking/sipcalc { }; From 9c9a21d525926574ee6b3f24a549d943673cabd1 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Mon, 28 Nov 2016 13:03:48 +1030 Subject: [PATCH 073/219] matrix-synapse service: Make url_preview_enabled optional (#20609) --- .../modules/services/misc/matrix-synapse.nix | 48 ++++++++++++++++++- pkgs/servers/matrix-synapse/default.nix | 2 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 277fc9a3902..4a1bea50c14 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -59,7 +59,12 @@ uploads_path: "/var/lib/matrix-synapse/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails} -url_preview_enabled: False +url_preview_enabled: ${fromBool cfg.url_preview_enabled} +${optionalString (cfg.url_preview_enabled == true) '' +url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} +url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} +url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} +''} recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" enable_registration_captcha: ${fromBool cfg.enable_registration_captcha} @@ -355,6 +360,47 @@ in { default = "10K"; description = "Number of events to cache in memory."; }; + url_preview_enabled = mkOption { + type = types.bool; + default = false; + description = '' + Is the preview URL API enabled? If enabled, you *must* specify an + explicit url_preview_ip_range_blacklist of IPs that the spider is + denied from accessing. + ''; + }; + url_preview_ip_range_blacklist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is denied + from accessing. + ''; + }; + url_preview_ip_range_whitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is allowed + to access even if they are specified in + url_preview_ip_range_blacklist. + ''; + }; + url_preview_url_blacklist = mkOption { + type = types.listOf types.str; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; + description = '' + Optional list of URL matches that the URL preview spider is + denied from accessing. + ''; + }; recaptcha_private_key = mkOption { type = types.str; default = ""; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d290c124244..d1301fad7ab 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec { pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - ldap3 psutil msgpack + ldap3 psutil msgpack lxml ]; # Checks fail because of Tox. From 2891256daa2dea79868de926a2640aa06748dc57 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 27 Nov 2016 21:38:41 -0500 Subject: [PATCH 074/219] skopeo: fix evaluation, change license from asl2 to asl20 --- pkgs/development/tools/skopeo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 547f21a6f5d..e724d00e4d3 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/projectatomic/skopeo"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl2; + license = stdenv.lib.licenses.asl20; }; } From 880d616ec007df10454b87593062711c39da9f7d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 28 Nov 2016 03:35:05 +0100 Subject: [PATCH 075/219] neovim: 0.1.6 -> 0.1.7 --- pkgs/applications/editors/neovim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 57a684d5572..e76683aa180 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -23,8 +23,8 @@ let src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad"; - sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf"; + rev = "11682793d84668057c5aedc3d7f8071bb54eaf2c"; + sha256 = "0pd90yx6xsagrqjipi26sxri1l4wdnx23ziad1zbxnqx9njxa7g3"; }; buildInputs = [ perl ]; @@ -60,13 +60,13 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp"; + sha256 = "0bk0raxlb1xsqyw9pmqmxvcq5szqhimidrasnvzrci84gld8cwz4"; }; enableParallelBuilding = true; From 016fa06c71c86c1e43ad8df91dae76d8ac9d7ab3 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sat, 5 Nov 2016 18:10:09 +1000 Subject: [PATCH 076/219] cjdns: Improving systemd unit description --- nixos/modules/services/networking/cjdns.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index f50dae2ab7b..0dd028997f4 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -198,8 +198,9 @@ in systemd.services.cjdns = { description = "cjdns: routing engine designed for security, scalability, speed and ease of use"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" "sleep.target"]; + after = [ "network-online.target" ]; + bindsTo = [ "network-online.target" ]; preStart = if cfg.confFile != null then "" else '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys @@ -235,7 +236,9 @@ in serviceConfig = { Type = "forking"; - Restart = "on-failure"; + Restart = "always"; + StartLimitInterval = 0; + RestartSec = 1; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; ProtectSystem = "full"; From bff2b98290b7167db60af97b0d6ac8fa280699d2 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 25 Nov 2016 11:24:07 +0100 Subject: [PATCH 077/219] ruby: 3.2.1 -> 2.3.3 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 336c861bbdc..9486d030a8b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -211,11 +211,11 @@ in { }; }; - ruby_2_3_1 = generic { - version = rubyVersion "2" "3" "1" ""; + ruby_2_3_3 = generic { + version = rubyVersion "2" "3" "3" ""; sha256 = { - src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q"; - git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r"; + src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; + git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 4c1321b5b87..d21e7d669dc 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -60,4 +60,9 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.3.3" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a69dcf75bb..93d96737261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5713,7 +5713,7 @@ in ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 - ruby_2_3_1; + ruby_2_3_3; # Ruby aliases ruby = ruby_2_3; @@ -5721,7 +5721,7 @@ in ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_1; + ruby_2_3 = ruby_2_3_3; scsh = callPackage ../development/interpreters/scsh { }; From d1055c0ed763286ec991a0caf286769f0bb3466e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 27 Nov 2016 22:12:06 -0500 Subject: [PATCH 078/219] all-packages.nix: whitespace cleanup --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93d96737261..69abb1d39b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10270,7 +10270,7 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B03; }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { From bd57e3231206cb967b9f03e0b5baf8f4fc4d4031 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 24 Nov 2016 00:43:37 -0600 Subject: [PATCH 079/219] file_cmds: init at 264.1.1 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../file_cmds/default.nix | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c63d7465a13..69dc2283645 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -39,6 +39,7 @@ let network_cmds = "481.20.1"; basic_cmds = "55"; adv_cmds = "163"; + file_cmds = "264.1.1"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -231,6 +232,7 @@ let basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; + file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix new file mode 100644 index 00000000000..2618b4974f9 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: + +appleDerivation rec { + buildInputs = [ xcbuild zlib bzip2 lzma ]; + + # some commands not working: + # mtree: _simple.h not found + # ipcs: sys/ipcs.h not found + # so remove their targets from the project + patchPhase = '' + substituteInPlace file_cmds.xcodeproj/project.pbxproj \ + --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ + --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ + --replace "productName = file_cmds;" "" + sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From de925e952e477153f555a3abcc911e4c843e33a1 Mon Sep 17 00:00:00 2001 From: Okasu Date: Sat, 26 Nov 2016 23:09:49 +0300 Subject: [PATCH 080/219] terminus-font-ttf: init at 4.40.1 --- lib/maintainers.nix | 1 + pkgs/data/fonts/terminus-font-ttf/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/data/fonts/terminus-font-ttf/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7e4a7168eff..11a4b14e08e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -323,6 +323,7 @@ ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; + okasu = "Okasu "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; orbekk = "KJ Ørbekk "; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix new file mode 100644 index 00000000000..e9adc4c0422 --- /dev/null +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "terminus-font-ttf-${version}"; + version = "4.40.1"; + + src = fetchurl { + url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; + }; + + buildInputs = [unzip]; + + installPhase = '' + for i in *.ttf; do + local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" + install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" + done + + install -Dm 644 COPYING "$out/share/doc/COPYING" + ''; + + meta = with stdenv.lib; { + description = "A clean fixed width TTF font"; + longDescription = '' + Monospaced bitmap font designed for long work with computers + (TTF version, mainly for Java applications) + ''; + homepage = http://files.ax86.net/terminus-ttf; + license = licenses.ofl; + maintainers = with maintainers; [ okasu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaeb7820717..c2af8edacc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17602,4 +17602,6 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; + + terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; } From 83410d9954ff9ce27023b66c86c05ace38a0c6e5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Nov 2016 08:52:26 +0100 Subject: [PATCH 081/219] beets: 1.3.19 -> 1.4.1 Full upstream release announcement: https://github.com/beetbox/beets/releases/tag/v1.4.1 I had to rebase the keyfinder-default-bin.patch in order to apply with the new release. Other than that I didn't test whether beets works on my machine, as I have a more or less temporary setup at the moment. However, since the bump of mutagen to version 1.34 in commit 555928c228634b4c372f38e6ea5c320c1662711b, the mediafile tests fail and thus this commit unbreaks beets. Signed-off-by: aszlig --- pkgs/tools/audio/beets/default.nix | 6 +++--- .../audio/beets/keyfinder-default-bin.patch | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c7b1d695041..0c6dc9219c4 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -74,13 +74,13 @@ let in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; - version = "1.3.19"; + version = "1.4.1"; src = fetchFromGitHub { - owner = "sampsyo"; + owner = "beetbox"; repo = "beets"; rev = "v${version}"; - sha256 = "0f2v1924ryx5xijpv1jycanl4471vcd7c5lld58lm0viyvh5k28x"; + sha256 = "1yj2m7l157lldhxanwifp3yv1c6k649iwhn061mcf26q4n8qmspk"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch index b0b573bbf31..1ea195a678e 100644 --- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -1,5 +1,5 @@ diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py -index b6131a4..b493792 100644 +index 34a4abc..59e8539 100644 --- a/beetsplug/keyfinder.py +++ b/beetsplug/keyfinder.py @@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): @@ -11,25 +11,26 @@ index b6131a4..b493792 100644 u'auto': True, u'overwrite': False, }) -@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): +@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): continue try: -- output = util.command_output([bin, b'-f', -+ output = util.command_output([bin, - util.syspath(item.path)]) +- output = util.command_output([bin, '-f', +- util.syspath(item.path)]) ++ output = util.command_output([bin, util.syspath(item.path)]) except (subprocess.CalledProcessError, OSError) as exc: self._log.error(u'execution failed: {0}', exc) + continue diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py -index 00952fe..01ff8d4 100644 +index 57e2bcd..c1ee916 100644 --- a/test/test_keyfinder.py +++ b/test/test_keyfinder.py -@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): +@@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): item.load() self.assertEqual(item['initial_key'], 'C#m') - self.command_output.assert_called_with( + command_output.assert_called_with( - ['KeyFinder', '-f', util.syspath(item.path)]) + ['keyfinder-cli', util.syspath(item.path)]) - def test_add_key_on_import(self): - self.command_output.return_value = 'dbm' + def test_add_key_on_import(self, command_output): + command_output.return_value = 'dbm' From 33d49bbfb733de7d4a69fc187af2da3c03667470 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Nov 2016 17:54:44 +0100 Subject: [PATCH 082/219] ocamlPackages.ocp-index: 1.1.4 -> 1.1.5 --- .../tools/ocaml/ocp-index/default.nix | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 721111f676f..6b865e9709a 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: let inherit (stdenv.lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let - version = "1.1.4"; - srcs = { - "4.03.0" = { - rev = "${version}-4.03"; - sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv"; - }; - "4.02.3" = { - rev = "${version}-4.02"; - sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8"; - }; - "4.01.0" = { - rev = "${version}"; - sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d"; - }; - }; - - src = fetchFromGitHub ({ - owner = "OCamlPro"; - repo = "ocp-index"; - } // srcs."${ocaml.version}"); + version = "1.1.5"; in stdenv.mkDerivation { name = "ocp-index-${version}"; - inherit src; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-index"; + rev = version; + sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; + }; + + patches = [ (fetchpatch { + url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; + sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; + }) ]; buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; From 5b6d52b4fb7378740d3c2e7017326a5d0f68711e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 28 Nov 2016 09:55:17 +0100 Subject: [PATCH 083/219] nagios: 4.0.8 -> 4.2.3 This update includes many security related fixes. Version 4.2.0 fixes: - CVE-2008-4796 - CVE-2013-4214 Version 4.2.2 fixes: - CVE-2016-9565 Version 4.2.3 fixes: - CVE-2016-8641 See https://www.nagios.org/projects/nagios-core/history/4x/ for full detail changes. --- pkgs/servers/monitoring/nagios/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index bf43a93a81b..c4d60cabaa3 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, perl, php, gd, libpng, zlib }: +{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.0.8"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb"; + sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3"; }; patches = [ ./nagios.patch ]; - buildInputs = [ php perl gd libpng zlib ]; + buildInputs = [ php perl gd libpng zlib unzip ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = "all"; From c77011c6decc989d11eef7dcbd37625c980f0790 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 28 Nov 2016 09:58:29 +0100 Subject: [PATCH 084/219] nagiosPluginsOfficial: 2.0.3 -> 2.1.4 See https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS for release history --- pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index 79180f17241..306dee0ec62 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-plugins-${version}"; - version = "2.0.3"; + version = "2.1.4"; src = fetchurl { url = "http://nagios-plugins.org/download/${name}.tar.gz"; - sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g"; + sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. From e36d243258889fa98efba3cb1ee3997d0af2c40e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 28 Nov 2016 11:16:13 +0100 Subject: [PATCH 085/219] rustc: Don't fail if deleting of breaking tests fails. --- pkgs/development/compilers/rust/rustc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 57480974a3f..18f5a41e51d 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -88,14 +88,14 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile linker-output-non-utf8 test - rm -vr src/test/run-make/linker-output-non-utf8/ + rm -vr src/test/run-make/linker-output-non-utf8 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs + rm -vr src/test/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs + rm -vr src/test/run-pass/issue-36474.rs || true # Useful debugging parameter # export VERBOSE=1 From bfc187f23a80a02135b2d76fb1e92adc7d5759ce Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 28 Nov 2016 11:21:12 +0100 Subject: [PATCH 086/219] rustc: Loosen bootstrapping restrictions. Newer nightlies check a new environment variable that if set will loosen restrictions on which compiler version can be used for bootstrapping. Upstream issue is at https://github.com/rust-lang/rust/pull/37265 --- pkgs/development/compilers/rust/rustc.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 18f5a41e51d..04543f17ec9 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation { NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + # Enable nightly features in stable compiles (used for + # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). + # This loosens the hard restrictions on bootstrapping-compiler + # versions. + RUSTC_BOOTSTRAP = "1"; + src = fetchgit { url = https://github.com/rust-lang/rust; rev = srcRev; From 4c7323545b21e103f6e864abb0dcec314eed6ae9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 27 Nov 2016 21:36:17 +0100 Subject: [PATCH 087/219] Revert "grsecurity: work around for #20490" This reverts commit e38b74ba89d3d03e01ee751131d2a6dc316ac33a. I failed to notice f19c961b4e461da045f2e72e73701059e5117be0; better use that fix instead. --- .../linux/kernel/grsecurity-modinst.patch | 12 ------------ pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/grsecurity-modinst.patch diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch deleted file mode 100644 index 275d96fbb29..00000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst ---- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100 -+++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100 -@@ -9,7 +9,7 @@ - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 999b9dc260a..fc9ef4ac53e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -99,14 +99,6 @@ rec { patch = ./grsecurity-nixos-kmod.patch; }; - # A temporary work-around for execvp: arglist too long error during - # module_install. Without this, no modules are installed into the - # resulting output. - grsecurity_modinst = - { name = "grsecurity-modinst"; - patch = ./grsecurity-modinst.patch; - }; - crc_regression = { name = "crc-backport-regression"; patch = ./crc-regression.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69abb1d39b2..6f7808b9b2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11207,7 +11207,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; + kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; From 1915f6908ab17bf37b8aa1cf33eef55f9fac69ce Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 27 Nov 2016 21:40:03 +0100 Subject: [PATCH 088/219] linux_grsec_nixos: use the "modinst arg list too long" patch An alternative to e38b74ba89d3d03e01ee751131d2a6dc316ac33a; see f19c961b4e461da045f2e72e73701059e5117be0 for details --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f7808b9b2a..bd390e1d245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11199,8 +11199,10 @@ in linux_grsec_nixos = callPackage ../build-support/grsecurity { inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - kernelPatches = with self.kernelPatches; [ bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = with self.kernelPatches; [ + bridge_stp_helper + modinst_arg_list_too_long + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 From b90ed0cc80293e16a219193f4b2495be14fd563b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 11:38:10 +0100 Subject: [PATCH 089/219] grsecurity: 4.8.10-201611232213 -> 4.8.11-201611271225 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index e0e8fbaf95e..4937c2271c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.10"; + version = "4.8.11"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; + sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fc9ef4ac53e..fa5984ebf8b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.10"; - grrev = "201611232213"; - sha256 = "13v3h6cjd5qz57rf242kpxhz5rk094lg5kyf86a852fk58apk6b6"; + { kver = "4.8.11"; + grrev = "201611271225"; + sha256 = "12vcy030vxi7h2dxyikfj8cirrifk9j186dbc2vk45dv4flcxpac"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 5da1394a587a9123f07a55d2bf8d9966df907c10 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 11:38:23 +0100 Subject: [PATCH 090/219] Revert "gradm: fix using gradm while the RBAC system is active" This reverts commit fdbf7dc8b38cd523804d342d2c153dfeb10cc83d. Unfortunately, while gradm now works when the RBAC system is enabled, gradm still fails when full system learning is enabled, so I probably need to try again later. --- pkgs/os-specific/linux/gradm/default.nix | 2 -- .../linux/gradm/gradm_nix_store.patch | 31 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/os-specific/linux/gradm/gradm_nix_store.patch diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 2beb0709469..7f64ed22771 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; - patches = [ ./gradm_nix_store.patch ]; - nativeBuildInputs = [ bison flex ]; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch b/pkgs/os-specific/linux/gradm/gradm_nix_store.patch deleted file mode 100644 index c1b7047324b..00000000000 --- a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ruN a/gradm_adm.c b/gradm_adm.c ---- a/gradm_adm.c 2016-08-13 18:56:45.000000000 +0200 -+++ b/gradm_adm.c 2016-11-26 02:47:05.829718770 +0100 -@@ -166,6 +166,8 @@ - ADD_OBJ("/usr/libx32", "rx"); - ADD_OBJ("/lib64", "rx"); - ADD_OBJ("/usr/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ(gradm_name, "x"); - ADD_OBJ(grpam_path, "x"); - -@@ -286,6 +288,8 @@ - ADD_OBJ("/usr/lib32", "rx"); - ADD_OBJ("/lib64", "rx"); - ADD_OBJ("/usr/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ("/tmp", ""); - ADD_OBJ("/tmp/krb5cc_pam*", "rwcd"); - ADD_OBJ(grpam_path, "x"); -@@ -369,6 +373,9 @@ - ADD_OBJ("/lib", "rx"); - ADD_OBJ("/lib32", "rx"); - ADD_OBJ("/lib64", "rx"); -+ ADD_OBJ("/nix/store", "h"); -+ ADD_OBJ("/nix/store/*/bin", "rx"); -+ ADD_OBJ("/nix/store/*/lib", "rx"); - ADD_OBJ("/usr", "rx"); - ADD_OBJ("/proc", "r"); - ADD_OBJ("/boot", "h"); From e99228db3014131255e19b88ba78e47b46a4bff8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 12:04:51 +0100 Subject: [PATCH 091/219] grsecurity module: force a known good kernel package set Previously, we would only set a default value, on the theory that `boot.kernelPackages` could be used to sanely configure a custom grsec kernel. Regrettably, this is not the case and users who expect e.g., `boot.kernelPackages = pkgs.linuxPackages_latest` to work will end up with a non-grsec kernel (this problem has come up twice on the bug tracker recently). With this patch, `security.grsecurity.enable = true` implies `boot.kernelPackages = linuxPackages_grsec_nixos` and any customization must be done via package override or by eschewing the module. --- nixos/modules/security/grsecurity.nix | 2 +- nixos/modules/security/grsecurity.xml | 44 +++++++++++++++++++-------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index ea245ecc5b6..92afb74956e 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -57,7 +57,7 @@ in config = mkIf cfg.enable { - boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos; + boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos; boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 6f9884336b1..e41748358fb 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -51,6 +51,13 @@ # nixos-rebuild boot # reboot + + Enabling the grsecurity module overrides + , to reduce the risk of + misconfiguration. + describes how to use a custom kernel package set. + + For most users, further configuration should be unnecessary. All users are encouraged to look over before using the system, however. If you experience problems, please refer to @@ -205,21 +212,22 @@ - To use a custom kernel with upstream's recommended settings for server - deployments: + To build a custom kernel using upstream's recommended settings for server + deployments, while still using the NixOS module: - boot.kernelPackages = - let - kernel = pkgs.linux_grsec_nixos.override { - extraConfig = '' - GRKERNSEC_CONFIG_AUTO y - GRKERNSEC_CONFIG_SERVER y - GRKERNSEC_CONFIG_SECURITY y - ''; + nixpkgs.config.packageOverrides = super: { + linux_grsec_nixos = super.linux_grsec_nixos.override { + extraConfig = '' + GRKERNSEC_CONFIG_AUTO y + GRKERNSEC_CONFIG_SERVER y + GRKERNSEC_CONFIG_SECURITY y + ''; }; - self = pkgs.linuxPackagesFor kernel self; - in self; + } + + + The wikibook provides an exhaustive listing of kernel configuration options. @@ -228,6 +236,18 @@ The NixOS module makes several assumptions about the kernel and so may be incompatible with your customised kernel. Currently, the only way to work around incompatibilities is to eschew the NixOS module. + + If not using the NixOS module, a custom grsecurity package set can + be specified inline instead, as in + + boot.kernelPackages = + let + kernel = pkgs.linux_grsec_nixos.override { + extraConfig = /* as above */; + }; + self = pkgs.linuxPackagesFor kernel self; + in self; + From 41ed3a8dd10b1e4babb045d06c2074042e13c7e0 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 24 Nov 2016 11:48:43 +0100 Subject: [PATCH 092/219] lnav: fix compilation nix-env -i lnav currently result of a failure: command_executor.cc:34:21: fatal error: pcrecpp.h: No such file or directory This fixes by using pcre-cpp instead of pcre. Signed-off-by: Vincent Demeester --- pkgs/tools/misc/lnav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index a4a081aeade..a3b40edb46c 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pcre, sqlite, ncurses, +{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses, readline, zlib, bzip2, autoconf, automake }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { zlib bzip2 ncurses - pcre + pcre-cpp readline sqlite ]; From c93ec7b6b75ce6c7aebe11a18f25f1831d0620a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 28 Nov 2016 13:54:57 +0100 Subject: [PATCH 093/219] bftpd: init at 4.4 --- pkgs/servers/ftp/bftpd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/ftp/bftpd/default.nix diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix new file mode 100644 index 00000000000..ceabce82c71 --- /dev/null +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "bftpd"; + version = "4.4"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; + sha256 = "0hgpqwv7mj1yln8ps9bbcjhl5hvs02nxjfkk9nhkr6fysfyyn1dq"; + }; + buildInputs = []; + preConfigure = '' + sed -re 's/-[og] 0//g' -i Makefile* + ''; + meta = { + inherit version; + description = ''A minimal ftp server''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://bftpd.sf.net/"; + downloadPage = "http://bftpd.sf.net/download.html"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd390e1d245..816fa30d4c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10016,6 +10016,8 @@ in sabnzbd = callPackage ../servers/sabnzbd { }; + bftpd = callPackage ../servers/ftp/bftpd {}; + bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; From 448d605f89fb0b66640c1a660b8f1e2b8d4a9893 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 28 Nov 2016 14:16:37 +0100 Subject: [PATCH 094/219] opencv3: adding myself as co-maintainer --- pkgs/development/libraries/opencv/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 2ad15ca8c15..d86a2671cde 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric flosse]; + maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter]; platforms = with stdenv.lib.platforms; linux; }; } From 70c18b55d71e8bd49c7ac0a1d149cdc1c963f2dd Mon Sep 17 00:00:00 2001 From: Tim Nieradzik Date: Fri, 11 Nov 2016 18:29:46 +0100 Subject: [PATCH 095/219] rxvt_unicode: create .desktop file --- .../misc/rxvt_unicode/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 69eda23b143..f3939d3b6eb 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,10 +1,21 @@ -{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, - fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf, - unicode3Support }: +{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft, + ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, + gdkPixbufSupport, gdk_pixbuf, unicode3Support }: let pname = "rxvt-unicode"; version = "9.22"; + description = "A clone of the well-known terminal emulator rxvt"; + + desktopItem = makeDesktopItem { + name = "${pname}"; + exec = "urxvt"; + icon = "utilities-terminal"; + comment = description; + desktopName = "URxvt"; + genericName = "${pname}"; + categories = "System;TerminalEmulator;"; + }; in stdenv.mkDerivation (rec { @@ -47,13 +58,14 @@ stdenv.mkDerivation (rec { postInstall = '' mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + cp -r ${desktopItem}/share/applications/ $out/share/ ''; - meta = { - description = "A clone of the well-known terminal emulator rxvt"; + meta = with stdenv.lib; { + inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = [ stdenv.lib.maintainers.mornfall ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.mornfall ]; + platforms = platforms.unix; }; }) From 121da5e93882073963836dcc2bbacc9e40f33d6c Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 28 Nov 2016 14:47:46 +0200 Subject: [PATCH 096/219] lxc: fix sandbox builds Package attempt to write /etc/bash_completion.d, I directed it to "${out}/etc/bash_completion.d" as it was suggested. --- pkgs/os-specific/linux/lxc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index aad73844a66..430836adb1a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" "sysconfdir=\${out}/etc" "sysconfigdir=\${out}/etc/default" + "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" ]; From a8eeef62e62bec7b09da028a7340b7bf7f2dc011 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 28 Nov 2016 13:44:20 +0200 Subject: [PATCH 097/219] lxc: 2.0.4 -> 2.0.6 (security) https://security-tracker.debian.org/tracker/CVE-2016-8649 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 430836adb1a..3c413ca2426 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "10lm7vfw4j7arcynmgyjqd8v2fqn7spbablj42j26kmzljcydj8l"; + sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw"; }; nativeBuildInputs = [ From 37715d1f46653f331d9b5e52e5436fc6afc6d6c2 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Mon, 28 Nov 2016 15:53:44 +0200 Subject: [PATCH 098/219] hydra-module: add cfg.package to hydra-evaluator path --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index b1b3404add0..fa550f68b33 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -343,7 +343,7 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" "network.target" ]; - path = [ pkgs.nettools ]; + path = [ cfg.package pkgs.nettools ]; environment = env; serviceConfig = { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator"; From 5c750e49404bbc70cc56f3f47b5aa8101e581eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 30 Oct 2016 10:48:48 +0100 Subject: [PATCH 099/219] Build all derivations at least for 64bit Linux --- pkgs/top-level/release-lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 34788736edd..5f6dd49d6ec 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -85,7 +85,7 @@ rec { packagePlatforms = mapAttrs (name: value: let res = builtins.tryEval ( if isDerivation value then - value.meta.hydraPlatforms or (value.meta.platforms or []) + value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ]) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else From b60873ed99ccdcd4c0fadc452ba025a75176dc16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Nov 2016 16:14:35 +0100 Subject: [PATCH 100/219] aws-sdk-cpp: 0.10.6 -> 1.0.34 --- .../libraries/aws-sdk-cpp/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 948cbacf876..3f5ebd9a8c1 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl +{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -7,25 +7,21 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "0.10.6"; + version = "1.0.34"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i"; + sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; }; - buildInputs = [ cmake curl ]; + buildInputs = [ cmake curl libuuid ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (apis != ["*"]) - "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}"; - - # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and - # therefore requires the followin flag until this package gets updated - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; enableParallelBuilding = true; @@ -37,12 +33,9 @@ stdenv.mkDerivation rec { done ''; - postInstall = - '' - # Move the .so files to a more reasonable location. - mv $out/lib/linux/*/Release/*.so $out/lib - rm -rf $out/lib/linux - ''; + NIX_LDFLAGS = lib.concatStringsSep " " ( + (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) + [ libuuid curl openssl zlib stdenv.cc.cc ]); meta = { description = "A C++ interface for Amazon Web Services"; From f390d68b7532eecea4856a9e0814697489a0ca2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Mon, 28 Nov 2016 17:03:19 +0100 Subject: [PATCH 101/219] yarp: 2.3.66.1 -> 2.3.68 --- pkgs/applications/science/robotics/yarp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 5e4bda1aaa0..76b05c8a3a7 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "yarp-${version}"; - version = "2.3.66"; + version = "2.3.68"; src = fetchFromGitHub { owner = "robotology"; repo = "yarp"; - rev = "v${version}.1"; - sha256 = "0hznysxhk6pd92fymcrnbbl8ah7rcwhcvb6n92v09zjv6yl5xpiq"; + rev = "v${version}"; + sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6"; }; buildInputs = [ cmake ace ]; From 44177794d253ea189e9aa9cde102085e76034f81 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 28 Nov 2016 15:41:28 +0100 Subject: [PATCH 102/219] =?UTF-8?q?matplotlib:=20Fix=20"attribute=20?= =?UTF-8?q?=E2=80=98tkinter=E2=80=99=20missing"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `tkinter` is not part of `python`, but of `pythonPackages`. --- pkgs/development/python-modules/matplotlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a9dced9b6c4..5ba813deba6 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ python.tkinter tcl tk tkinter libX11 ]; + ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; patches = [ ./basedirlist.patch ] ++ From b67ae8b33c38b442a7d0f4bed0e68a8cd85e22bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Nov 2016 18:55:04 +0100 Subject: [PATCH 103/219] llvmPackages*.lldb: fixup input by disabling libedit Fixes #20773. https://llvm.org/bugs/show_bug.cgi?id=28898 Of course, feel free to find a better solution. I love this copy&paste :-/ --- pkgs/development/compilers/llvm/3.4/lldb.nix | 1 + pkgs/development/compilers/llvm/3.5/lldb.nix | 1 + pkgs/development/compilers/llvm/3.6/lldb.nix | 1 + pkgs/development/compilers/llvm/3.7/lldb.nix | 1 + pkgs/development/compilers/llvm/3.8/lldb.nix | 1 + pkgs/development/compilers/llvm/3.9/lldb.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index cd498b5cf51..9d42d81923a 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 8e7c8151df1..bbffa1a9a93 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index 207971b8172..17f7f5793b9 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index 434fdc7650f..36f9cb1f139 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index 568476e44ac..fe0dcfc8306 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 0acef48f57b..55c00eb07fc 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; From 5d804566dfecaa3928893244399b86453edcacb3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 28 Nov 2016 06:28:38 +0100 Subject: [PATCH 104/219] lxc: 2.0.4 -> 2.0.6 Fixes CVE-2016-8649. See https://lists.linuxcontainers.org/pipermail/lxc-users/2016-November/012597.html. --- pkgs/os-specific/linux/lxc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c413ca2426..79f6b4d5043 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" + "bashcompdir=\${out}/etc/bash_completion.d" ]; postInstall = '' From 2d341ca7fcb5a835a6e59d1f823c26159acaba90 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 29 Nov 2016 03:12:10 +0900 Subject: [PATCH 105/219] firefox-bin: 50.0 -> 50.0.1 --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index ac4bc88e128..cee9f16390b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "50.0"; + version = "50.0.1"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "d1fc1b384b44067920b63385d486d41e6fcd47ed14ab31dce708ae25029bb5b437ba5824725c90573d9ccd010c3d4c83131afaf2a2494fdee56a8b7f2ad3c24b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "cb4a8a03e4a2fd495c8fd6e9b42d6a9556ef7033b8aa6d587b45ed64f2d7b96e1cdaf3dd4413f1a55aaf4300c473ca6abda8cd823efc3a33f15b6f2c693cfc31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "f2d22dda5b35a4a093fdde9fd6d99b7ba6540c5da218ab8ec87fdf1094b740c71a73e3bd62997fd4a3726a99c39a4c441e1cf3adfb5d56f07752dd508001c802"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "4dee2a39797423ae4f525b14a007019ac0f4ec2ca781c3ba2b2e6d62dc7fa538c1fa8d2f4b8d7eebdfbece391bcf56bf96a2ef74fb290ebfd217e7ce8f43717b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "56778bd3626177faaeed0a0da8d5db2913fe9fd0f2341b9f438a9862066a8e5818f2ae746f79e03c6c576c5735945c5df378c72269f80054bfb93228b881403b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "b509fddc94fca6960be4bf358391e2dcd256c70d7a0c730759ba2832b56b654c5d4aff74773499f7be4bf2238c6b575a97a4df28c5943439d0025dda9dab7c18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "5480712a3a2a40872ca7ac9625d76761b81a64319b3bb8e675d86022973784621a104dd28c651d7ab633ec11f50823d1a849def5cb06016b54d44c86f586d383"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2fc3d317f1afca7784f949bf56dec725228db5f41c8e3be855d5d2bedf416803ba7e32a1fb89628ab844967212cc3a7d0b6320f4a820563e71a70edf0637d3f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d6634c1ca6d82e2ed2e7e283431ed95dd65b1db558f50c73130b6d3804517a199d22819c74d6caf66cbbbb3185241990c7bc90fb4932249e5d19c6c48eee6caa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1688ec07557c477fdb6ea2df524e28a3acc125016d6d2ea5042d8bc0cc8ba3a8e77f65f44ff41298502459f10749f615484aac9dd3ac6ffcfa8db04f6355d8b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "96ec194358754aa1c71c1d929fe0641544fb25bbc73e31a865b7f31b5def4320c56d56ffe81388348bc24ac9cb62c4d5055aa2e6b31124cbea9637c1e529f13b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "46497eb1eb6c432bddd6ae1e9a39f4d86c9f14d3f956302ab2bc5d57625a6f966f687d978e1e93bc351be2c0d32150a5b2873fbb62309698fa7c37794adefb00"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "208d81168e9cdabee3b590813d64bce6211ab9e3cc2bcd11ebeff90a2705f037d2c489a6a50c6e786ade80eaa17faf388b6540610e51f308da03e14e453cc7b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "844f3be9b6f52d34f2fb87d8a881a50e49a4820fa97f522d9e462127b88ea4ffdd36a514f353fbbf80e702452a26e2dc30bcd750a0cbd43b26452937955c9c68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "e0e2f3d6eef948867888f4564dd3322d5e44cde5573675c6d58fbbaddee65e787a31284172f688854e3646bb57e71961ca04ee4623ea3192be1483e5d677dcff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "459f5192ca7a1f8dc6f3f22c106db1dd216a41cb11122050e02f86cec06e578fa033b00c1d8355a5a2a759fd8702a14dbaa3a706ec28c50911c2250d4561b228"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3ce16e6e974c41d671a58c16b44f660f420dabb7eba7eba9213ba6d86fb029ff495f507a09a1669c6c3641a6dfa9b377a511141b0c3d55839a7ca1e2790a188d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "53e965cdf50e12a876a9301370029254953eea1bf4e6ff45ef62835a48d25630a59de0ef655b8bd1664e1746b656c556d0955f39ca2e0c9fbf95b795a93197e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "789eb6dc6f3f42051ba5f91999fb675955b568198dbe7cce3b2bfe3f3763859a1610009480edd348c857f42704da3338eea28617f97d8272b24a2ff95c7b2450"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "9cd693b98776e426c0c6d66934c0f7beb7c692b0df5967d09c91889dd12a8a2652cd4641acaaf1c6d7aff9b740504ca54c4fe518496d855316eeb82f82c6f31b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "b36d55da04a98b29291b65c6f6ced5ccc67bdce7d3265665258e2ad212c5c0f7928943f55b98678924ed1d05121e2d2beaf7fafea9044d7ea4e0263ae2aad3a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "f9049cd7d5d67fb52587710d5b7a273819439064a621af6de051a196c5ea597d0d27aaecf638eca1670ac08570df91be906d30935e1f79c2d53c080a5d715ccf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c8c61f8ab7476c073776e27a9c8110ed5c2968782c9580b5d9afe3670472f984fb4e586a2ce50cc6b0f65dc3628f9fa632c12c9219cb9a5375c5d845f1d39f18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "601f5785b61f6900c496cd73430d679d459ef8e4fe37463e752b483ddb16c4c879451fca67c97a4e74bf75473116c171f5ae4ce8da4fb17742785ef7d0baa365"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "c45716c519a29b5b94383b7c23c592b4d7922c0778abdd0c87519576ba1af459180dbdd87aee112cb9b7f607d3100cf38bb47c59ec1b2dabb6f96169f09c97c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a3a4873487737ca3ad80f4b683ee3342a340dee4543af007b21e7bec008c3187755857cfbd3aa63a16478e93d80b4f40ab1fda44cbf9bb7ed7abfc760073b535"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "5470ebe85f960627e9b9f08ae37fda4eaf0203542d8e4c2aca85ba54fa8fd8d1694b8722a67e647c9b71ceb75d7eeedb338f9b75f630694fe084160c241d6a1d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "98ac4372d48b0b7f714ea81da512ca46ccb2fc5d35c17a8e4e17f48942a34008de55935ed65295034376a6d6c6d0b9c984cf7eb82f9450a90adc7d714c8514c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "499fc78ab65e872218282cecfdb72ea8ffc54cada9e9f533d5b678c235512489a3f75c78893058a05853372c23cce11e581cc95b9dc249c9932e9d0e4d9ede30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "e92f0713a43a1ef4884de071ac598df37499bef2f636031f3e685308dcbc62bdd11ad5b633c4e35f07eb85279bf1114a0210a890f4813d68b114ca52a9122636"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "0f068b5756a5c6bea869207282cd916703ddabdefe815bdc08a27c70e9992a1041db9ce6dcbb3cc063788ee438cab624cf89ddea480765ef3f09d6b4467c3eb7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "12f0eae081ddaadbc89283f17b0f69ba677c4f368b29f6cc3bbe308be5beb5be7938019fdcd924abf274c49464ce23e03277e010fe40bbc78f7aba2b6ad8995b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "ab8a1f8afdece2b69a510a3946dd6fc5763c25bd03456ffe4181aa2b6c3f17471578a64ea1b0a65085ca8682bb7f6cd8c4939394c4686e9ffc3478aa2a7b3a7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "2aec664a8884547a81b2cb0bb8a0cf2aa7f5f1ad6c02ead41e6e752cfd0d6739aa408b6d0461a88eacdadf4f2c8323f4de9f8d50669ce756c904510a243d964d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "77d28752fb60f2347393cd952329ab9ab128cbe3442117d2f4d53e84ea69ff10862d930a1884788db61bf6a910909d9ded46e56f2b3ea791a2e4f89b8dc1fab1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "e864623ef2af94a161f1a22d233480f7bf94adf0a9f75cb23caae207b47a5d34ba9d1d1cc00fe8a51121d3d465f5af087ac5020fc6ba246fc850c5ae4ff3edda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "148e4c1990f0e68e0550f00d517355f0d2e81f744ec592b297ad3c6a1be12baadedc0d7485ac1585e09891a162fc3fcab1d96645a2b4ab04dbe3b2853fe837f4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a13463559ebdd0409d9e2c5de410b748be28de1455fc5b38d8531fd3afaac17e5e5520435908788f5370d4d8329c9dd692d3c2c1e6e0cd00e7f0ec76b2797b1e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "699f12418a92ea82b3bf96b2b2217f20260dbea294c2e7a37f03f9a6f15820fc15cbfb73c0ef3f2e0ff10353b5e6f61a39a4c57d61d6e51da5ba48cce9b6a0a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7a8de523144d4f87062f2984788f77e2a36a12087d62e5bb3f054ae7251821aeb9b8d11b5f1c45304dfb9bdd2380f4b5a131c1d5c5a9918d23e0c419f0f27fc0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "9058fa8f99d96eb073581ba96ed37fb6d17ac87040730219962b0afa7348ae39582167b051d3c5e8f11ed6467b36fd73433c3262217f4990b917ad14470a4255"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "7b4230b827e08863c427ad1b059a8509d9e4bd8de953f588cf750b0dfef5e40bf310022301a2005152fea31c9fe14510c9503ee4fea2362c37e98e52f90abc16"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "352ef41a90a9bb237a223d33235d98b0b1d319d30ff091e4b7c3bcf62c7f2511c8fb42d78bc8cbc41f52be4e0111975ad7e7e67e71611170409f41d126e648e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d452f6bf0bf4a361ca42e9545dc98cae9dbaffe1815efc92e3ee59a91d59554a248b95737d6cfb0e1e40b6cff3fdbbb66a13ded7366572a2b7bb5acb15bcb62e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ed9153779e91537aab0f44f86262663da2c0fd32850cb18c86a31952926d0df0ad07108989d698bfbe9f6fd4db8d4e000d5eccb10a9080f1ff0e7fc055e8319a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "f9c077f4f196cb664383824ef8899db8916890addafaf850aaa99629ede100cfd438af674f37dabe2bd5f8f1e56b870cc308476e5d13e5a24bd3f1694b9719fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "baa0c4a63a9849dddabfc99f63f42ef007eaec21bfbd9929629c7b3201005256f4862046896a4099c143653bc29967d26c3db35dcf8b39bedc920b8c06625103"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "28c11301d9937a1a7489d2d26d86b44b942d84396a8c0ec4af2cda078ba7c2159452ed44a0132ff3c0d6b93487bead5de373aa0463eede5ea4a9cec3eb95c698"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "400763f0273a3be94cde7c38bb410e654e99d190ace2a81d1b588f2bfb143fa7e4a425a9549b5edcdb02a324825d70faa65020752f236043d9e3448313062748"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "8bcea2944595a7900dc3a55c4e1d8b0fd70bede700bb244bc75ae981f33e32b67e89878715114e073e64d17b5ab351019628224b47bfe33ddc9a195a0ef08ed4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "57a5daa81df3381f32246813e352d453424264cf724b3666d796a0181f08ff0e1a57df53fd089facd5fa32ed072e7821412383de997141cf50fb8a8d73c0ade9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "caad9fe9203dbcb03dde31c3a3826d9ab3fc6a8df9a55e79036848d055d7594988c479e6021762a94d5a47fd931aa8f6650947e34d3bbbaccb702002f967e5f3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "61ea4becca8ccd9ee635567bb87e881b57ddda08ec00a0cdf4a50c80532789f9730a3a5e7a1c1368d6a80354369471603e89f3e7f2539c6dbce2a40b7821524f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "748fec2bf32a63ee7eeb59835e17dc0c60ae78ff3fb3f05b59d4082e29475d8b3758c978a8fbf260ff616c32487e36f2efd0b51b69c8647e9997e8a6c7d0e5f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "2fa4107225c498691148f444eb6497e71111613097d50e4610ac0bec893acd7893e0f3bd4024e2351509f4778af281df3baea97a523d4be4540c6ff28f29aafb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1d9b298fc979b7baab7dfbfca12c172544cec8828afca494a75d0e0517b6cdc89693e94e3cd1c2887d7156a0fd54da9c59adbbc055947f1e9f4c4880f6a125fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "903146601206d5e196684fd908de24ea34d287aee2d03ce68fe2ae8092799a38054ec5a9be2d94b2d3680088eb4a58d2a8a8834652519dd3db2340667041e032"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e84dac8ca10564581f6a13b436a86010da60e88c38ae6f06c67129f2d3c33b4c1bf202810c19bd781aea7a55a809f4bb46cc8fed4b26e892dcd798731d19ea92"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "689674c1ce12fe8f04d0a2824d78ccc0e0685320dbfc83ce5ad00b07ef62dd34bac5ec9719d97241d790daaf20dedfaf63f05b062aff63ca87eaf9b43f796b9b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "37b8a6b008402ec8ae0dca89a062e9f6b0c84de04a3ebef98de45453252e3f373bc5c58c918c5e7caf05afd8c97fb4b691ec67b22330e3386ff8810d8b46dab9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "54d5963fbed7204c0311430f620479ce5eeb0ee3f8d5dc2611c8bf7fc76ca6e44c26d5bc8156afc2406d17b7e6c72a966469333ee1426e2de053666a246a9008"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "8296591b01349424dcdea4683795b5063b89d15aed67c299298abc2842e313b18c426e42e687fb7fabe7d6a54cb39af7ebbb1374ad0fbdba42d9c012a82ec8f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3da3bd8e914e155662c9d8377e198e3363b931d4c2483ed880b1d7f7199380165e44183d9e9bb8189a7d461f080c3a0b5cc5b2041c939a2fb8625e4728f4c8ed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "1fbaceba15cd7e11b93c0e6977f5711e9aeae64d42e2b8a21aa42c814ee432c7cb0a64a84f0b5d1268275a69dfe2677859f37fb5f62e3d8c729473f4483fe794"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "21825fd0502866603d3878702d505e3db60e21fde005a4e3ce1d6ddb2c695859c56c1ee352f9a4dcfa6ab4f3bab7a8f7bb4f75d0868920af0186f16d88850d20"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "52ee181257cac9b916be9c804a1ff7e33f363a1ad2b6aafbbe00d461c4f9d1949345cd7b55d10df0eecf7f0e410ac07a9d7d5ae6dfe142cd594b5b72348726e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "612013364ce9f9d984d00c815e8e76f1b45c2de7bc013bdf49aa83c46d522c940e694c530c8a1d9971c1c5a2234b1bdd438f41903fd777b29ea5d51df6c314b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aa93258af4ffa49068887638a33ff41ad29895ecc86ed329094a2b925b655755048b08f862cfb1a5c1d86365dcc1adef2227054c8b5eeac9f46268e1558d10ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "be02f1bcc28af5d4b3cd6e1eca126846cd1443a2f0caa3d1e59be0f3046c5373a22b3fd5c3a853601249ee3e34100cf308bfc1ba54c514bc4cce3b647ce0c691"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "008d3b64553faaff26ff79a2123d81c0df3d5aa2dc9a6c678cbf472bee47c11d235c59711c5915e5ac991401d076dc7f3edc1da8207481d1c1f871a79a4362b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "74dbea8c626496a356a0b29fc302f03565dfcdd60e9ea4d68b8b3d3a45f43d66230b2c76919ec4cfd2e4b8d5d4d07d901912a471aeb582c3d35c5799c4d3dda4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "982ed9e4b817e90b19b2c104b3eae8117b59bded0b066dc773b9515aa8daadc322dc80105a5bc961ce7b0a3c5630838a26492f014be41d92ebde140030dad5c1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "4be2dfcaf244ec9a3ac64291dc1a77a6359fa4922bfda8a57d847418104adc7f591ae3ff51a5b2d0b2b04e916649889d852e9527b0b59f965fa90b3c091be431"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "151ca36fa5fd165a1992a682934f0219fb2b85a7a9aab8f503f4cc6685bce5253c7c9317c71007e8fcb2064c3c63c4107c696b5c2651bb1aa3b25897a2d3b17e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "37dd8b1d6162c05bffe114ea632485316e99cade321f4bda64ee61718f85d61e39c85f543b221833ba3bfbffec29926c907c9ea9349fb54600172c64d1d751a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "ae2b24bbbbac0eac95e559cb21561e15221d4d40acb4b6bc069c353e1c0af123cc396a960918683f88f2ab8d6b0207e585a83289704c18ff4735fea3c7e8f51a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "7105f05777629d12e7c90ec1574cc96a762938841e19185b3b077bdd52d6c28827e285eca95d2d6b0be899541981370f09944bad7773edd646b5199100f50b7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "a7dec692e8500d9e884a46cb1f2e340522d770c35b5f0c2743448747ce4322cea63149679f7409162772bd9a13c8275d099ea22ad711ce124d426300e0bb9473"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "74a46b05abfe713b3f9df1fd651dccd97b281d7d5c5ff93856c6d88c50b0a49428610dc7d8fe6ad5748290d15c2194750e890ddb79b7f7b2eeee77cf9d277bed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "486d32491f9f54d374fe24622477677ee90d09209c0eb74bcb52b93d33c2d0a8a540e195cdcc3fb117bf82ed0b777bee6465da51291f1d2998b0fcc1dcec1557"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "e471f9cf94e85bcf3a0404c9ea0cec7adfb38b64f93a931b86a164814d7b8cdb95d9e78d3790b21235a4da816710ca7f2b9fc547ceb5c11f9d4ed949a7a68ab2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "70399ee841ca80a3add669509249a57d5be11a7fd69aec4bfdf6eb0d5df5d40941fd59ebd79a0598699fc3adb5e162837691261e31922af8d8074caae6ea0977"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "dacacdfcc223c9709d0082be2a1f51568b8d8adece09640cfd4df74e29ee41c0cf28fc926899310d15a3ee81975f860ae00e896a825f3660ada72fc9318aa23e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "fbf321e64deba8b83d5e128179671b4c9fc6582ec5447b1a85044f1b142cbbf7f1a38abaab1b6d85f6ce9fff00575f3cc1dc08906f469a8f51b9a51f2d1c86ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "3434e4e259373981127422de30f8d659789651ba5220135a05286ac76e5a468d6d80c9a09f379ea0f4f03f1542ba5fbec064c54718c73bfa85cdd3144ccf5991"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d400e6afb62dbcf65e1697bca8aca8d2aabd5391bce50b83201e28fd140c00cef11dcaa7d68ad69a9e82f31e93b3ae350bb0aa2ddf4370cc672a77510bdab89c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "2210439603d946eca55701bdb95449fffb898442efe85d31059d0314e033c39a8b460b6e7f95c08bb9da145acd27744dc7d59600111bddfee05302c9743aaf4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "154d4124cd2fab2f7c01e8e8c4b55ceac6a6582d2c425517a04ab0ba7211f9a834840baf56042a106d59e33e2e6f616597e1f29a21b183567f410627a1bf658b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d33f95c47d6d56599b67e19185b629b05e35ef085d0b8fe08ae461aba3cf9d21b186667f55a5dceba1019fdee6fdc4c105b7e5d7f625252cca5f939c8b7a0cd7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "a10434af0fd28a6c38a3bc57acd257dced2f2ec476ce18c7da07927295a98e8ec86f5dcc9012e2c6eb155b70d0ac7c143f74ead9f18bba932c192e5efff87087"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "f82ba0dea755c93cac27cdfa58b40a79cba3cf09efa126bd978aaead0d64716ec4f9aefbdc3a8e1af0d06fcf2279f1c545efb6177b641fbbcdc24052c7655860"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "65ae4501c718705163fdccf39e53ef9c753f8b841221832ad6967921e0e7b385a23c0dacf9a1d5f5b309cd1dbfa813879f5a2fd3f0ca93c3dec6865ff36ef5ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "dded53d77f186a64336517d5d0cc7777bea256de43cb31f96d35cffc64a55c703b9b986038e82949369348ac83a7a42d4356b72e329e635ec827ddad8d6b5cf9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "95c883bed5f89a826241b0e8c0f8ca5db10a534a1045ac2b0bc4ac9c93b9dd788644bb3404a95883641c6ed18696096f198dfb74f243a6a6a2d9b59f5e075c4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "1dbd123dc5a8c15eaf311964fa46175cbefd6a72c84f0e046bdcf0904d942f8e375ad0205e2b708403482ace902b8457377c988eb57aec5a64f366273f818177"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "d1ccf36aaf7f85cfbdf34f5ec80b73757fb5fa7d1a0f7929bb97e5ebe5ad0cd189d0d288a4ca9466467968234b5b3939b1ffd2650266e26c506c95d0ab36ef61"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7092e252bb6ed7290d0e0acb6d6fa0be6a4b89e48610909b74a954246eac6066fc2931132afdd15aee617000f59ad042141fe8a83e1a37a1ec9f0bb96197330e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "1f4b21c65356dc4fb959072020123850654cd0eaecc6057f138608ecdcdca215a64089441d0a2cb2f0b892c430d41f5b24cfc202f3f2fc994ec2cfb5d520cfc3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "41a1e8b539b0eeefbae4c031a997fd8196a05ff4e7883288936b8a4caf6d30f0b6104aad3b955843bd982f8a6785e038bc15913a6423c4a8bc43c5815f890343"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cdd26321281d3049b9e34ccbc153af22f8f6a8b43f989df7ad74c448f21b5bc318ec3f6d26d6b9e35e60efe856b831a26e2785bb08b005791ad5b5a7d68feb15"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "87a8b95bfb8171dd49999ae47f788b1818df0916fc66da9a4bacab5ffafd9791055e49ac5497d19aeb9404a62c6cb9874596f7d5a29c4c7355f119b5105e80bd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "04c6e5be875955cb4333ccf5bf8134c8485cd65bec9f86f3b06e8e9593bc45ca0d85ffccb7a0477287ed9a5700621d0555627c1261bcc2322d4c446086b6cdf1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e3e597bac7ec1aa163a1e758d23c633d9d453613f8b52bac4b566b6499b1fe1658fcaff1b466f37a752f862a48985a811606ac9c92ea65b8f75a9ff8c2172d7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "1f686ebf1cf1ca38e7e67a9ebfc73af6e9e72e648c34f7e3d2a0e4092c14697dd7608ab4ead11ce38edf3eaead09f96e01d81ad6b8491b54523f37268d1527e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "b21bba0745523be576c2f99002e01463bbcf5a3dd122578bf78b5614c303e336d3e5c1a27a2b7ad88d53b7df4b063352c867fe66bfd25c167c17c7fc2e81622b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "9f6b1506ed8fa820f1619d30dc045781a1bcb92f6755c0aad38fc5143c522341ff62afc39d6158aab863996d400a89546d4d2b4fec4f207c01d5c1ad1df8163c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "1822443cf61962f06ba82bfb5bf344aeedd12ee77e44acec0fb292ed6ec9fd843f2dab3e43caa0cb633107b8b79f30db88d0fbdfbbceaa5b6441141796a82699"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "54542ebefdeecc74344396862dd443bc09c910ff02cc49980e40dc8ec202cc187ee925d560e3d5c409f88b92158aaea2fe2be3ac24a56d370e50f6a9d0caaff1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ca6dca9be0e957d35adfb7f95a38677836620be986fe2b99a5437d5dc64258d081b91c31502103ad61f8f7828d1d6f18049fdd3248721a44ea31a0648512366"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9503bd88caf715738f8fcfb2b249fac0cb69873c4c5ed36eda4b06fd1e7f3032c7c8488613a042fc8236cbdaa93c1ef5d7a1d81d374559070006bbd714597313"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "666615b5905236e42c96c40d911a26b5d9c6c888d825d5bfeb6eccf9881668df41258920093c477e06470ba97046896390fc9fdae4e29e00ef5aad12064fd66a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "88d7accbd48856477137efde6b2b3d37b017c2b7126e4d37e0b328094e6d110e278ac75b61ac3a09cb5de63aa76b21adfb093327a099013d107fc772b1a7686a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "eb2300f63ac5983be2138afe6d588385b80595b736ec4d2f878bec3adebb27c5f1fa789103fd500e7297ae5034541287512602d6edf35035bff2c4d2b8f4c087"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "b45dbcde74268f95b2279ab735140a14ebb2c2a375e8dd296be95136d24f60c2ddf687f61a09218f9bc17575b0014827415b02dad4b3958540cb1fb2b78fff40"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "6252465e24583b2ee5599a47ff008287a3321955cdfccfb0a8d9b174e02b644e463c2aedf77d9ae9678cf2c682fbec07796a13fea060c735ccc6b11390c3792e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "068ecd5325471dffe741bcd02adcb3308497eb3c1e2a1679675e27fc8ac58e233457589a56d4eae658540a0876b2e3c1f39407b404a322ea079d95195ae736b9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "4690b802d91833bd96f7beaabd302ffd9bd40795893cd196a0f09ea47e333e7d645f0462b12fa0ca8909cdee07f2efab5094a0925d3fc11e48138098468ab43e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "88b4c27346fd74cea35eb635b02840ea771f015fd9f2700751ca26978f502ebce23cecf425e70cf558e38ad4ccb6cc86558190aeb559194005474b6777399591"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "171fe438b11434ef3ed68507d6bd1465b0d8f9af9a77fefcd2fc7730f0bc8a46a319d9e3d94227b2051e18b990cd8167103e0cf50293bfc0fa57a3b539b4fe5b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "1f59cd9237149dc22c540461abc640367f02d65103cd60e1d7afb8f43b973cf03122130fb6c665b418896932cae1d4deb7241b45f7d4dcdfe8ea69f0bd4b8143"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "0cfc6ff07e0fa2b194ca8851d52e3f819f96626d21b827fac14319c849f0fdde21d269637cd5c833d6f0adadd49656b9dbf603d1c0f761aea912c4b8f89917dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "de1c49aff4dc4cc4fe2c57a658d1c7dd2ef7b7b7067247c1c261a89109548ba3d22ec7ae488b9c7d338fdef50317ed095ac4cb7390673c6e10e5eb28ffaa3d08"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f4a470619058a8d509d4fb25f017f859628c0f502de4af7504ec189e70dd07460aedf7ad0dd36224c57eb6b6acad763d6781893369e1db7ed1e12050a0bbd6e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "13e5c2fd2f0aab0ebf186d4042e3aaba4b5a7d01a6de1515e9ae34c2d1d81825fd6db52ae7994f0c6f711830dd95e32fbe61e1e09a020cae08a85f575ae2d22d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3ee62d50bf8dbf1d013e61b19856efebe5a5624f4111286c81ccb4449a6d8124702106a49405570cfa810c0a32f0737e9cc105bd75229d466864e8471a5e5c44"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "39531760eb1cfe7ef58d7c2eb8eee3fa8c467e9880d3a1ddb0f957364949df0af06c0d03b91e50efe420f16c26df32ce5214979fa7088a79cd1de70691fa8a9c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e566041725660698d2c51941859301036801aef3596ff250ad9faa96d1333951ba388df09aaedf04204becfa9e177448fff5229845f6a8b5507784e4df0665c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "b11ca7ad3089bdcd2921a882395384cc2e35512488224e0d3b7b227c05436064a8fa6d174221adbcf405bf274a63e61d365a3a3b4b5a6d9f053714448cb267c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "7f6f5a34bd1f2a6c9b637768af109f7612847258f45dd59d713004dc2b7c9cb46387310b000416d96e6ce1266e709f30df9fc48bdc97312f082ffa9c5ed3fc28"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "db633339a4ab8c788b267aa2435a13607a5d1fda365c06f1d90f19e5604b60a809dae31e8d135204fb14d8af8a67334dcf62a88e29102c30a19c1ecb9ef415ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "841de10098e98a2148dd035983d7d1e2429e1b10789d5bdc8fad5d3276427eafc6ad9d9cf2db0038eab313484835a8ebd77098c7018f81fb0b9fb523c4841bdd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ae58d4a6a5d0b5ea1d5d080598fbcd6235c06657b4a3ee3b294bcd4f7360094a47a26bbdc6d5de8d2b782b3f243dda31bfb663bd3c7f81b0b980b9b75a089205"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "20d1a99edb738fde9791404ab0b55385386d33c74b1d2f944c1f8cd3b3175fc8a8ddf7351ab8f551a6d6299379e7551366a6cc02461c8ce3a28e59da4094e636"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b3e77c5d5730c616170361d785ce138bba1ebff030b33d88eb3340eee53114e07e9129072e77e2cc10513b036bd05ccf7e1e1e46ab3a7c760b8eab7963a69152"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7e2a99511fb20a8f34a9fa18f66a45643cae32313818dde229239a48eed7ab8ddc71c501f8b14233e67daaf0f4dc914fb9ffbb0ef807a89209a5a46fe4ae62cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "8d3b86add09c64c76bbf0ce7530d43785704fd38c98859dc9c2c42364f58633de61de8dbe00dfae9f89f8c9960acc42eef317c1d87b8e7944daf54e18b295073"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "9aa2853624394395ac0f17ca3a0fbf90b8519e852e16b12ea8221a9ba146cb87d7e3b881e26db4be69aa9499e8f6c2f83be2ce7aca9a4c1ed8eaf562d98b80d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "7dd5dfa772b8869eef4b47ba01380b84989135690fae5417ff029ce2b1226c7335239e4832fae760a311c184d21a6cf3f92f30531620614c16829084b41cb48d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "d9a431bd40fdefe3c84e820c6d6df478dd26a8eefe7ec42537891fb8043ac0101363e256d953f85cf48f812aca09e8800aad4263f6999da1e079d75d09386031"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "f1c2a10e5ecb74570c5e985ba09763d362105242b53fc9e9cd51098f3bc8f4f9280c7290b9ba4335e455ce9e3dd175f67554fb25aa86544d37fc609b8b98adca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "0958cb1f5ef1260da0931cc4e16c81ab8995711acf846a2658c5f184968c13fd8d40af27613ce2b5c6e5ad462ee14f39f2a614294bea9cfb2dc875d0f0e8779c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "5ae4cf72ebc9af54a7b24ae0a37947cb4e8045f674538d26ee642d4fb7547e6ee2fe5525c4e04b8aa41a34ec26276832663088ba379f6abbcc9ccde533388f7b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "48c20ddc5d312f3720bdb8b40cde75830475fcc00ef579c100aa45d668416ae9dd048fe5711448eab59d50b019326aea7885110ef15112e7c4e58185dade84cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "4e2a66781f0d7e7349debaab08a6c532a82a603562a65437230c7301f2abc6674a6acbd4254c616e3bff8eab53978c780f870141cab42872a0361f853e3be6ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "d2cbb5bd4e7dea0596c3fe16ce2dc383e4c8408f5a4f0a9035094a8b714961d3d541b473c586ec8a3140984e8ac902d940e5e86be5215321090c14fb67688a33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "81ec70d793ece3f33ca7dbf7667764a9ed9d0234b084dbd2ea1e92bcce281ed71133f342618c30be4195da49247ac09b44eb27c9a2996cf07d5f5a17455ea939"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "07e460bf0545e35399c937f06a6a848e4967eed45e86562a6a9a673baeaf1beade10ff7bad1d3892f9304e6018bc87260e212c067a81ca7bc25f2a8e9fbc5f2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "23a097dd2e8047f9623a35f4190c7acc70123f9f0347e2ca204bc7cd71da4b2c20a3c26192773eae70bc5fbaa7ec194b9137a8f30c28bae672c608c58bdb3f23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "1bfac64a39a787f02311a0486badc56f0a3058362b6c4947b92688cc654e21c6502703464f0e3a90ec7eac35fb2596e3ddff7b23b3970316320d38e013d5db88"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "dddf6b5248c71ec8fd152d5d9ee24809add324d529fddfca6166c48e300e92a9bcc96084b2b3b99968044174cefa757e8af8f5d13198a0ff0fac59c321b3f00c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "1ca56172371a3470cec3ec174b6cc14fd5721bc29e3f7683d8f5009c5ace2a5aeb005d28cc9096398e79c03dbeb6a3f14677b9792ce95fb36c8c69d0070a0b78"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2fa6ec9328ab40f46eae66e18ae167d9bccd4d5be43fe3ab5fce73059941178af8813bfe7fe26106ad569e6d1c03338e440ee32722f041e73ec63338828e4d23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b3aa500e2b55b502d60f322c63f08f5add6063b8b5f0f2d4cbecabd56b08ab8a20792f47c34daac6d9c56e9d74d10fc15ef3901f27442e5de2db0933932b3dfe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "c1deecac7551c39b3b47b0b97896ae8264519251e58f5f34272bf15f53f4d6b28a82bd8a55ff584d501aeed00b6c2d6c56a7d6594d2ea4129fa2f16951cec4d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4655634990c822e94bc9cea432a0c90de92dbdc3b6d033a546c8d30a23c078b5725e20151f61c60c92ade138aca083032c7182fb7030d53accf2586d03d435f4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8c5a0d0e3a042750a72b40908a862e4e98d0350efe9f10ee7a1c0c27913ebdc94ebbf4cc216f12b7ba459b2b12c889df2715e2664a6eb3ad52107c3c791f26c3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7a9616abba37469aa5c8686a726723f32059a682ab35c0d3ca179ae8c817490c01947b69d329e224526a972e9116d4755303fc99f601b1a4d2581e75b77924b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "39b28857af6b2ca281eda2525731987a9eb3474f538fcdc402d3bc067ed28d43c445f88355ed84a30c5f99f1b9f7281435501fb4dc89ba217ff9a0b2d7121026"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "318dd8b07c62f2c98c35695d36b4273d4e3189d0003b5047be5f5c1bf49ae9b82a33ea3244f37e354b4c6b0db75c068042c22a6949b2dc90045ae2f87a8b45c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "690ff481c3c79ed3bb8b0ee3157a5f1708f53a985cefa245776a47ccb93ad769228fe76db665d8488884a93f397d219dd8474fd1a63744be54d7b9cfa58ef37e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "d55e6447238a8bcd1521eae2167064eb4951bc11dcd7a16227ec4690d4ca7d56a567a70d2737a084bbe3aa4e5276970586b4bf21d16c85e2435ed60824d32a38"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f48485a6ce34e2915d91a4673af7bc050776bdbffb8e9dd3656691e9cd389c9534666969de7bef065c4825012594ee1e4e633b1fcf4f4947bdcf644c08962304"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b7b006f1ff11895bca5b33cb138385055b902730892dccd5620d1537c3dba6c4a5a8c6a11d4a61ed0baa75feadccf04aad29ca251f7bf19c17c7d8db13c401b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "1f7c5dd068f4829569b398691ebb719c851ff165844eb4ca1d26026a4d40926ebc3c71c4ddcaa5e8d9b9b159ed5d08d24e2b50d3a93d111cad3d3d02d5a26f43"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ee698d3366f202ae4ff8ed2f1d8bbe1e592fa6200e9734469292d76595e3629d3818744ae05d1d37e7372c622f79b4e8c075011dd7b835a61aba86b272c6ac94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "7037a57a9e456bed79b7527b35bd680c32a94204c94b1b9d0247c0e521867ea0c606875e11a3bce6f5c2271a5e322f3481cc5451fc413cec5a5f6f199a676a2b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "62870d113beadebcfafba9c6d133cdc88769f20088b788a8577a99afa85562df901f14ce1f2c8bf6e344ac31b8a8dcb96172a5724add11936f78aba7d26d5444"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "5c9cca0455a4da647b8f2b178bbe73037b1d5c7ffe95dd12ee3042ab982da0cea21ff9afd4b954805966d25b035d0ad83fe138dc80a7d345a81a01df722a9dba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "0f7e16b46d0c931e147f1f6efa7ba4d12d629bb909f220bfccd9646e968e52e1d7641ab174880313781f1c149ef7b4f6311acb042b704fd18337a31531fc8863"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "864a500456f1728c2043e6841256a21613864501d7428248606495c8c34ceefe0db23b3dca6a3fca9f92a22af663109d41ffe46daf19d64aad379774848a448f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "94cbfc40c5c9cbf13592a7134cc4ec2ee2fea4b733738acb45ca454e029228cf741111c5478961494a9e7965f771fca06aef0e58eca076721e8bfb11ee237202"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a4d7ca792c89f37fc1457e36beba54e75a5901bbad1832272a03b0bcaa3536ed237559aca38775e16940c035b117efd1caa1929e96c889843d2732d5cbbe38a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3b740953b1a9456321e684cb0dd606967d46d9ebc120d43a10244b88586c1ac4fa7cd6c7ede0fdb52690fb102e8a8a456c1c226ac7eecaa50776b52062e5285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "6a45689d06f4d52c5352d69049e55346c8791720f1d38257a49ad8ddeb9d94c0b0adafdb10a3432b4e4a75dd83eff618d7731a3bbf8752c979c0efc09b67a363"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "f1691996ead43b59409f590a46bd97359183a05ca5f5bf49966d128b2de6b8bcc2fff2c3f73e3966a8f6182aff9c1dabb88e659ce128ca6ae4cf11aa877c8df1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "9fd0fe5312763143d83677b11efd0dab2e84fd93cf4a884261d33dfc23d76facd7be7d6e3701e3dc9134bfe7ac7cf8d3138f63dc490964d1b6dd696451ae18cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f15b3c3e4b57447023a6086b948b5f68bb5c6301c3e7f138d7e61b2cf34d87357b7e5894bcc6262552449a5d67c2548f52fa3942b01603c15cdc9803fa45660e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b28e30d95f608733099acfc6c39e0062bc3470d8ba386ea563d9b376f95e5a4bb9374d0fc360d0a387b9edd1ba252b437cf32c555c68667323648830efd96e45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "b351d0c9f5bce2da39dd4dc500377e7a07812c6ee2c3359a15b095be562b90b43da6bd7c61435c04791278b9e47eb2ed9dbcb589fc86abdf84a16dea86c88dca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3912d4ef5bd3e9cb5bd7e6f559c66e06568a1441394c41a9a47433c28a551f3c012717adb66f02441106e20cbf866a4a201af079f4f59b9c34ed1250fb64b22e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1438e36a719409637e246b2d2b18b7493b00446daaa18579d2c1c45866e0aa597a8934e9d3c15893d987dccf1c1df5d4a03d34f37cbb3b3f2d2fcd52392621ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "cd5f4baef991942ac555dcc8ed37857d4a9faa29befb8b8dcce82f000a87b0bf62f0ce208df7f7238b8d7e684294f33d63194bedb21e988085bc64241fcf633f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "79fca7e28b71bcf665021ebd54bf8acb80d6d598a2abd6235d455dd64085ebb4b26ec14341a3139a70ddd96f8e5861b7f2685cd1f5cb909af0f12d21d1bffc11"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "07af694903d677e11d6266d251bb7aad31e0c21e0bc7af67cb4888af20c38aa02c001799b93836553a9699d038ae896337d75ba4dacd47aba02b979097a4863c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "ed0afc72579b59cd59be409dd35d18becd8eb7a8bbaf4fb1de451cc29cf8464a528f4bd78fd914f1951ac9b9f45ec8f12291f1487ed9c5f0dbcf4a2fdb821c82"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "18d387115da72dc1312864cb67f0ba40e94546bfe1cd4530ae97c5f58443508fd0bd94e91a9f2e6bcc528b115449ae2abc53f6c318cbfc0d1db5415f80ef8ada"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "deb7a2e2cebb721e90d19820b4489ad64f90603dc7d88596083c7bea9cca7910e2d17d502329fa1a427d08d5ba6dacbd34a1e7855ff7a48933fde61d2650ff0d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "c9cfc8237a0415ee375a2a8dd08f83ac039fad866da05a55cb2adc2a3bfcfc2293f9059139588e93ee25568c5099d80a9dc56321e7dae92bcd0b076d7d1a8062"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "ce2418f967e8ea03acfc2c8b47dd4460127865917134f555e44c834ec4eb5cc1bcce6fbfedaffdfcc372fd40d757693fea5dad570730b3fe1e69e8ebea732d8c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "cfc8ab9c94df5c60881b48ec32807128597c528fb22ccd08afaa643a232f6e793ea04263e445ba468099e58a7f81bf5721b839ea6adf75f201521bbd59ae0fa1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "41057a92d38896a11eecabab4d85cc08765764f0f33581d604fa4e76ddd1600030033309cefe62c1e8d43b45ca1a25a079c522d54329b6aaf59b7a17c76b6991"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1feb97f7553d4aa4ab914806bbdaa16bfbcf192b002f4875f8796389a7f9b892c4dbf4f04fb52f17d062d9e555831d6eb31ed32714f0bd45d3e629aa65f0abaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2d5ba2c2682276eb58c92c7a45e4c6e8341dcbda1eb01214b4e912ba7aba084357e35e35a03e51e51d246f72d25293482ad60dfc6bcbef1710b1df10b1f63893"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "0ffef374f47f8525d02e578e5cceee5821ed1319368e3cb9c78e8037f4089e3113db156bd77437c7c41af8dc57538d27484fc405791f39f0a431b72cb199b7c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "c95091418cceeca6f5d84e65200566bef4b1b316f78177cacd2191ce9c6637cea5bc53a2f44f318edb04bd1e08a2976afd8d8e523ff65e471f71576a62c10207"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "ee8557e2a39f6f04d6269ff6dc09fb17ffe383b9441c499b626f8c0ede6e0984b9c338e30d356d13b1a7d226c72b949a0a868d6baf542726a972e1655b3de868"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "0617722ffb61b7a732a1d2b448ff5f513effcab4ec2eaf1d97ebbeb69ed8cd693f20137d4e1d83e128bb7cfeeacb98b4c149a0a51935010f00b3e554d00d740f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "2fe7086dbbc7886a0bbb2b75f493c3c4d45497f1de9625e2a64c4cc506d8f73e42000d3ba3d81e39861817e7545f9b29ea3a41f27440d1587c0a4f04a99e5f84"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "ecf746ac12b5508d143e98252a121d246f00776daac2d1c972978a37701ddd2132d562ab328bbc2cc4cdc74e02232ff70efaa8ba5ad50769994d1b393eabb8db"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "7e04449f5e3934e73357622c9d1819cb84111a963ddb59b06e1b266d6f56afa78cbb88da7a41fedb7ab695149900fac70e5b379171accabd6c903dc211d2eff2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "75198737ab142988f034ea78a3e289992107da83b115ad671487320a0fb6af4f3aab1589676542725d25e9b0f43ec30da41bc95c63597228337d25ff73baa8cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "c1096bae08cad67205dab2b81d25b8cfe835eb3a2657701d6f89fa978f92d5c45b5a3e9dfe90f3cf78158f5fc68922da4c235d57dd837d4b00933207265ddc23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a0fe8351efd9ebf9c3441a831a50aa1d5eb413b5d9f1a7f57e068a25c00c2efc062c71bfe47501ca5016138fb22762a3a37dd90e50113bb038fd1566adc36fc6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2cfcfa36468f16c7f3b32d98ecb51c432a8ccb19a91cfa8e99974b21a60851c1b73aa4e9261b10cc9ea0bdc4c862c9db6dc9cacd46d2070abaf991812e680d45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "9c6acb0013921bd51ba7caf4016a75ee6f02e7388cca676fad6ef7e330f984ef28667da14a777740f9d7d03659fd74c0621a2ecb2b447106998362815dd74fbb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "828599a94a461ebed9fce77e0968741cfc0e79375cc9bc0584d1fabfa11fd7a5300406298ddd0b9650548c18db5873376cef155807b62a110ede500d62e2effe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "6581af0e61dc1286af63f7ff18270a7a8326679f8090f3dda07917cd3bce0febbce45b30e8d819231fd91e1d15eed394525d24afe79fbc8841148e85f332940a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "89d0c07943c2c7ec8052289afdedb9483ed5752a5967795938d12fb87b8ab80248058f2162e84a9bf526d1165b4f7d651f39e7dd9eda9b4455565f8f48f1a4e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "b879086f33d86da437d4839c6c3443b8b4bb524ea1645b460a8f7a90c2d3e3aeab540daad501b7ba2c9960eb625e74ece8cbbffc39e6931e0421beafba0969eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "5b2a622224c0b0fd9f6e003a051bcbc25c9282e464f21c16495779f22c5f64275ee3e5c10afe31802b8badd99b7346533b7999e7e525f24f7e3a78450ffc0ac5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "961eac523fd0402c9f1b4532c00661df5391a08f3af6180007f5f59e754fa795063c188491614f2e7ff1d253fcb04b34216a95718edac035df3c62f6714c8906"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "9768209346ccb052e92e44833a5672dd032f5915106b7884f6b4c363a257010d284120ff20931f0c6f68c0f4c72b4818408bd8f723d24879932fc598aea4f06b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "b1d788775f15216273338c9f12a61712b546acd6b353681adf44d19c5349ae35d201737c69c19c0e7ef3abb8d3df36e07093523eb8af7cb81d56cadf5906d52e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "b54c884cea39defa105556302e483f4f39d96f413df8eb94e8232d0b5832ab760d2affa2ff248851fc8a060dcbeed84b9ec58b4fe2dbed963b19a497bdaf7ebb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "98c249ee8a67bd48e6368033c5b7b06ea0940ee66568d6105b13ae7a3d58fac6e1135376962958a4a290bdabc43fa0a0ee8fb32429e3c2c7e5dd0296ba0f55ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "1fe74bfa41d59ef31384ee5f819ec284d1dde33f62da767699f0decff49a1f00a4fe44860546aa20a404a743420c5bcc20b7a67ae9bb7c01b072f113edc90ac0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "444287facf993cf321dd477d366498beb4a834ef6977b71a6e328566a16c6a17aa3d5f67b5bae26cd4476b85e1271f72b9223939db528b2998d21bf5237a9d05"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "c087db44747af90822881d7e466f8246df0d5bce957aa93ff9c27da16cab195f29121cc67d1de9099c3e018c6ff2a6f22435b2c1ea3a5e99bb8592dc0a8bb0d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "9d8ee1ae3b1a8072b9ffc7162707ab8b5881d96970c72ff5d27dd78f37527f163ee30feb64121e9b7eba6ba0002ac7a6ba511364770f2c9759781cd6435d8d06"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "83f05cf00a86f26c414b11227c3a893608a218cfbfde29b67ec7d10fbadaad95dd59402557d1a58dc15a4cd50e27f8c15ad067b9cd3387f5e1080c280377c6d9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "1dbabac6ef0365dcced762805a25dfcc867185430dbf87a0affbe0eda4e37fb0100844b9ef7418fcea54f1950779a57afefd9fc2b8c3b9777df08134dd8b172d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "86c145eb3e031f677bd3e66e3e52442d85e02d2350b3c281094e8f72279b0edb19ec4bfae15819d4c7b483f0bdd00c324cafaed4cf924af606be1f29da19ff87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f217dd91412f709055f085e747593a1c06f71f23cf87afd04685ff4f9dc7511d2aa0ca60f6ed9e7751ce9d18dd801788a0981deb9233b6457eb294b9d3a6803d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "b15189ccbc478ac7eb57c1a3027fc4865a87490cd0ce6023110793bfa2451d64d98e6ef70d9c33e42b2fe50a042b140961b6cda1e9e44d787045bcd880fac7a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "289efe9e1046a3367ae7f379c86405808acbcd7478a10af0a785f8cbba2a0645888bf5dc180b6a3ebe300a69a0ebfc12b211b1b6901ff4343da88a0ce17b9161"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "df65892afd9e6e13e5ef6b6e94a453a6402286171f87bdbda21d51abb2d8a2900aa1cecf01cba9216ebdb8ccc60d7d40c9e6ba2710de2e170b223c18b7030708"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "e768d47528799f22c291abef82ff372f9f7a60a844f26c61e94ed39c0998f0fda4abaa3e27f520079b741c0cdcfd973e9745a5c39cba02d9de3bfe74ee06e9a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "56bc42624be4e27a086f4a38cdc1613a291a5ab22859bca25e39651b23854d596c68f7ab930026bf7a7df590bfb429538ff8bc59f6a6cf6f5249768fc1dc414f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f89f6a75878b89c0c1252c17d3baad19a4f44ed9e64880c345521be8ca643f5edc83097261f849b2b46eab3923bacc17c9f9e143a7ca98b702c53a5151e0d4e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7a518aebce8a27b9561c576054dff8e58759f56bc986a3a0626e2de7053ec69677f57b22e56ee54e6eb2ee1ed06d9ce650300731602b19f85cfb17d3c6ebc891"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "76e24f56a9072c88207221ed4f607d4f03144581301ccb8eaca66ac9d0fafc4c2ef67c446b6bf4001586de943336d854e0d950b3e5aebbc167c43422d484cbef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "76f65744d90c79393f1ab4ce35ce86f8e970c35675761bc74aad07c66e69e0a403261c502d697497c0034c4bfa1043decb9f3fc83a7aa8c386d2ebc7b6b422b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "c577bddd6b71d93772abe83c2a4b7ecc26bab5e3f53d7a8ebdf820f4694173603d969e8baded32eb5e0a750c5f8da2afa829341685c78e4f83396739dd340e8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "38e55ee251bbae1d96008742c5c6a3b4eb5150c442d6b0728849dfaf444d77fdac9c11865388fa224633668de578c66d0ae16192dc1fec7930d4cc7684369f1b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "382e026173aa82f00bc817704f2acc030ab2f939bce4f6e6ed039b1d4f917c57e35be5812ab57616097ec9e27a81c36517bd7977b777dd6bbec5f347bd985645"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dfbce27fb2bece1f32b5c10d93c48c927d2c60673240e4ae65f33c5658aabb682f3dbae0fb2c44c8465e54711ba879afdd4ec09feb04b9b4b7b9f73675eeb878"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "bf49fd10f7e70e419d2a4eac4277066121a54ed588533523412d5286613459b74086cd49b44e77266217444c851a9d78497e0ab3bf821db86038f948bec40011"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6fd53b36740c0bc2ed524b3cfdc1cf6baad630304a67543695ddd8dcf3d5e254cf5b754d188dfd93a4d27848ab99c89e1a473435dc32513bec0c7464c5f523f7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "15d08e8ab252be103741f40ec36f2a782372c29ad8ccb6af7b79557d1aba7381d4ab7186247702772777fd68c31dd0de6a78c7117f33c90f8ab58ceab8b7445a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f5f4e74d181bfee27d402b5d2123934480eff95c0240d762f7f648e4220fe3c9c154df8b849d9ea27bd4d0b53997d3175f7f3b7bc8ee70be7086d0bf676a729b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "7eb67ca81cfd0ee4a19b98cc00db084a2d29f1b335bb51ecf75a833f1133ff31345726292bb03c777a6654070685c78774c53a263fede51c4c101f6bd22249d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a91f4ae5ec30fd2447521984432ea1997796f6569e99c2763364ff6857e579f1c0631addd4fc8f0faed5f489efef6bd29d817de58dc1b432abb0698a5b0291ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "7f9318bc697e5654f0585f18fe9525c1eaf24de3e9e33c87a7d0471ec8d41552798d9149cc58f3849a0cfa5850639ec95332df861f9215061bb3eb9af78fedf0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "6a1fdf302c54afdc25e1b2e3c055044b8c37eeba5e51fab0ff3df9517f3137482f9daf28da4cd62072845e368260986e9d03593074e4b448f3aa23de5c7a3dd2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "c07bf9368b8c49936dbd4f36aa01f40d10c23edddc14526177e2ea98bdf7f36e482eece3e2f3ff16f04f0078f7c993833c52014514cdad4d1c476f326fcd8482"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "0fd3b4e08cf0ce0f3d68880564f1c14bdef198f0140404ecdf4cf9c8d48cc7dff0dcda9be0b3af274878efc9ca3b764cead6430d0e348c550cd5abc23dda16ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "0395d9d46363a2f598615551aba6ed3b0419f83038c7744dc29253469a52c318c474bc564fd1560d9f5bf9375bde1a9f4013dcefcc781ebc82bfbfec6c910ec2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "3c804f341dbe6d69e2cdfdd2dc1bc294dc04c4ea3bfd4a62e4de6edbca0be00f76a3112a56c9e5b3ae0929cf01168cadf7242246fbdbe25ff74bb088714c05a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "056cb941c6ad6b9445a896d3cf948c942aa5c2f9506b80b72f1a3926e33c2f0798c6ef437152637a3a137f6b6e8d8f0eaef869788e7925282705a00d3d5ab01c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "325baae030a6b23bb4dbc8bf51a87dbc27c6349b3d56366730d2aee975aabf9f1d9af505b7fb1ea6aeab4f5891ac74166c5acbf72b503accf5614480d57c7402"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "f5c475b7c0c8d7ff4426c840189fa6b6e2a39ad64b1ba24477ed5cf164e55c4ea7065ca3785d9c56d5d35503c26bf52a00d491b3557b307f437a0744d7cd100d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "603b0bd1087e63f2d0e0ac26266cdc7e038e8faa014d80f9f0e194b2878886b466a541c8c4b79a1026ccc60cec6d0f555d6e65a7a53dacdb7cb595a7f877f6f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "4abf78014ad6eaa93c9ddfca43f24c9f4e160b8f9619ddffd57a31a30721ad8d11e7f3b4697de76b30ea6a3a07973b460febca607000a48da7e6d422548e1ef0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1614556b3b9ac0ed6be7ca4455882fe57a9644dfed95b0b3818498d4b47cde9c95fcca66d820802154721ab90ecff8e662f3670ffc6f4f5224dc35139fbc6fed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "d38810c0bb088c999079575253492df0fa57d1995c2e88c5a49ec57e858e3c550bf86a4e834037f6ab11b1d956b941557cf44d562c8214ece0175c61b6de34d1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "d498f468ed487c5dfb70cd8e831d7694665e9cdc2a9eb0fd7526e4f7c3f97873af87fd919990b03e921dabdcf35859840f263fd071ec4151f5812461c97c8179"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1f2f939987840e0e845238a4123d81c698b528474b81facb7a296d80be023aee8b3036db095709167ea3da310a9040d7bbee5d16f7c7aad6444f3c1e078b2ce2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "29954be29ffcf9dce21f53fb674d5d14f17ba04315dcb114756478e0cb4c6b58e61ec1c1fbdc7a25808a1ca347b512691481090504b1ac85e6998950edd043bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "92fcdffc99f3d7b6bd70889b3ad6bb661ea7071be6ce65461dfb1a93b4a566ab5b5f24c7cfefe6c2d6515e8f42b3d04ec01a13c2919e47daeffdb5034ebd5e36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "66adebeb4bcdac0060b8cf562607deb8956588d86a04fee35f23b753614aba9588e74e2d389055c5186099bc200fde27529a26392ba08c0aa69ccd9be12a5eb0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "4ddfe0518a1487479c0c68b53cf24f9eebdcd91cde738053cb3e796f9373a0147f980a3dd7356ab92083f2b8975379c42691e7dd9cf5d78075a86cfe5a83d8e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "3fc217727c139a11ab77218428269851df78ae42fc34e4deb34ba48733bee2af878aadc5a90578c467072ac4f328ba5db3f1588069573521e951aecae25552ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "6bd026db0390d79a142954b2c8feae4f884cacfd5f8418e31b7c6b88ec171160054424c87af81ca8701a32065e9de3d469699471a99aed498683296765d22033"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "751fc9580027ae5dbd05202578dfe059b1c849dac79975da4245c94e5fa7089a7f189fe1510341072b41fbe8e1fa5e22217a9876cd033e062fb6c567523e3326"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "1c229bf7dfec02cf035a2b6d2b17b55d24fc7ad6b36f1c2be7f08898a94c02e31e1812e1232e348907e177038d935b0f90f800165314eea3a7605616f828d493"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "563f92a47fb7f4d86d39e88458f38aabfd5f64cd3fd54e51a5572eeedc57a5b0b3bb86bc26837b2438623edf3d06ab37a94064ae9ac5a2431c3038dd75a71913"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "568d0da98615df8489a04dfc277235d39ffca0a6cf78e15eb04f7784be3b2a3a7480dc0f3e04a2d22bc35e6b77c0f23a9d90bc8c8786812c89454086d5723445"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2079fe3f54992ea7a7d2ce90c9615e748896c595115958e5dd018d33f743ab79b3325242171bdcdc49818692088698aab1e351d35c535cc854904d42e4ef78c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "10fa4e95d71a5a12f2c4cbc2b97c2bbc1301902d76b6dec99f16f55e73a4a8dfa560e4d8f2dffc347918405749c1b32c3c55b70e6b3b5d9e45566785ecb8d009"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "eb00d3f069d8eaad95a4534cfc422722977856af50d7477a427372ebbb1dc0f1606dae97f05457e6a5da3b7e1bd7689ece4ebbf7592bf7439a495170be6c52e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "11ddfff8f81de369d721a24c61696fbf80d636396b9b7464c2ec163f8009961599b06c97df6dd1a4494478f7741728c6220292b762d0f7273dc68be65ab05a6c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "f8b13383b7f67512312fa8d82cffe4fa21ce1aa64e04d75171faff12c0aa3311ba57e0875ab4dec47e2c1db057a041b921dfd0919587494e571c57a14461ae5a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "76631fb790cf3ea88f35dd5aff6243f7577e200ad16699c206206e02a30b472004712e78b563f115124d3c7bcaf8fdd07f98e731a78629f93accae55a4baacb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8bd8ad5efcc8e8cef7d59f9be575e5314b2a02dd16e8244bae80864ea684649af8a8eaa2ee40cfff426ef6472802fefaa98d9a7389d2a5be870cae9b4581eebb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "863f9b6f99a2f025351b7dc3f4796d8b04f2506424ca39fb5bbffe46d123b5f2d74a773af0e2d28b646164e52c1e9efdb097c91ddbf2bf1ab912c787e575f89a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "934c47c03281e90ca801e87594e0710208bb5f308a10fac386343492581d918e6342bbbabf57c2be959b9c894454d2dcce38923307f036a759e80b1d31d89cd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "4d56f033f9b397bcce792017166db2ec5e589d5bc7a3b20e8eb4ca534db11f570df7fbaaebe60d64370325b8ba07c98874aa1d74b58a979090696a0e0bf77f71"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e9eb7539cfd92cac77c44c9ec99cf9bf2c9b3d6a1e014d3a8e0b084cef05fd32bb215ff66323618ee9a7c4312732e8a471df5e63710b172eda304ffbac7e8075"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "9dec3fb45cbb51c101e8b2c22ad68ad508d865f6f903be9dfd8d818ef907e6d4d377a7b075ada729fb66e98187dffde59e5e669349ec0e02e632d47921586f8c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ed8d2995ee07a66e5be3b72c2dac6d0fba53613983ba8a76ce01c169033d6b9014de514bfbd9592f0eb6835884f56ff1ff7ef9e2ebd5f0dbb347f6f95db47f7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "d180080acd094e6bb7d5e5f2a3e8f13b0e4d672f4f4640786b14a481e52bdec7b865e9f9c970eb8f8987764cdb4155a2964fd8ad8f5c4c3a8d3929b3002f48ef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f158b113ca2c05539c032b8c416c8f5ed022c81bc56f20a95e38e5ea641255b8f780d85c641e5bee2ad347f7b8e3cacf26e18a5c4095c7bc588f4e54784d3028"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "b964b35ec30fc17965483085fea1cd09450dae10602e04495bd50855fae48b44893f825decd0bbad81fed42d211d85fdcada39b24d07d48236ba208275be6215"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3c92f3e9bb5203a2c316e95e2dbb0f94607eaf96c125b7bb96f2962b9bdb5cc2f5d1df44f02fc2154c6da8b5b359177c1cd7cf5379139f43d3f0f0531fd8a03d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e27c1b36220d344746fafeaed2a92639f938abbc268f30efe3665c3da1f01a5990e961686cddc4143e4b33126606728cc4b70ae1031d8e628d156f1b2895c624"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f021cc29f230113577026052c5350d0196e144675dea80248c3449974b7bcbe7e19310c9324cc3b779d50c50a1445793001049c11dedb8841b9f57c26abe5dbf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "760cbfd406fd8771897b7e5f8646efb30f8ef769e48045b1f26f38fd70efd0def8e03804b649bc838815063c75c1e8309858b80a54301411e91271811d86560b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "813b0510a7bd3a1f6d6a2da8d408d038d577d051f600a195068edf7679868a259bdc25b6d3225aa52a3d83278625764deb4918a7649c2cfbb565e88b9a0c587a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e20012964a11e4d3d05fcd3107bbb9449d023b2749e4fb41a7f84d1d7c9ddd686be46dea9eb589e2e99ba60832cae7e673f8dcf9ea96b8219ffb7b6be3f82430"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "7b1b2c23baad1ddf53e1ac3e10ae7dbe8d963f2d7bd4f1b0dd1f06c1c3162cb415c3b11a2c08e4bc689c296cc1304b970d376a77b253ddafd92e54ec35d2bb3b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "5304b7bb4e3cf2e97c8eb8a5704dd10c8abf8416b12003b85368154f17d777bcf50fc5b725acf3a2570c17db1327564e854e934a7364b67a4276d77d28c486e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9c2d778bb1b8db25ec8aad1566f2c1c05484a604cfc388ca2bc9c6fa1128ebc4a298e5c5ba4be416e7ef22e1c995b529903855154e4e732d5f3df33bbddcb555"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "6d04c7a7f2019fcb5a726f3d1f1c4e26530b6c19a4f7fa353f40c5ce5d79792270bbfdf2b3c03d0c092bbd908b0525fc4cef24ac7550a06c9b052bad6770e618"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "5ce1c0588b6e1e4e9336d937c5b8669698eaf88c3fc3a72a528cc1e18e5ad2141056efe96daeb892d86553211679a4c34e15839e6057ff9c891de3cfa4d89cbd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "5eca438952f9158863f72e69d9a76a63d02e1ff7bfb63bfdaa52a21c6ac1d7b693ef996b4dca6e869a688d2b829b563550a7623f38b15a6f900de24d696e9bb5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "e5f65271adf2744ad36b4c453e3691cc14c067550c0f720797c3b7f92e74abb47d48db3b0d1c24df9285d1b88692aa18b1fa35902ea1bb08367a89cf238bf75d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "e9e8e1c989af0374af8d33cfc2ad35bb07351214316065162eafe395d54c6b8b0560b0447b41814967cb70639ac95f34f80251d48bda0c2b55647850aac77728"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "44687873e3fc48153c2685855fc1dd3f81ceb2ac4e363f7dae3e5a09700baae3c073de6cc35ac40bc8f1634daa446a8747d28aa6d0c8d50819e9691ba5be14eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "97184b1d0b7e959f6b29be6fd040e9e2dbb9a6c95a94b314103ab4e45fd369c3cbf6a755d229f4c5d862fbe31aa911d8c2fa2e191f929fb9fc456f1da46b324a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "073a4b720bff6e703b77ee7b66ec636868acbb9fdb508146e87ee6d5762caf9c03b835ad6f8556fd3485e9830a7194baf3e7cd3119bacd3e7d4ec8084805d7ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "86548875a1e5ad4fcd514545369affcbeb0a1a1cb4f9ed95be3c811659013ab134466a80ac2f8e085b77c409d8b657d39d9eeef289b7d2c3ae49a04315439c87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "79f42dae37ce34f2ccbc59efdbdf582ab5ad73eb9df8ac655b3e0a986077a5dfffabe7c11fdcce4660217343bcced993076caae14c3fc88e14d5545110252641"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "227375f9866434b5810c74a9664b913b567291c1efe5f8eb970a092d7eb6fcb8c70b99ace68460a8276af11dce88998aed9f194a7e9abda6383b56d6632fb624"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "bb5c9a2fde5e9e56d96bc9a0331a2a19e44f93e0f3ddab699e02f281313a9b19bbb3734e936d49d80dad5027443f40603184fac710adda1f5f2338cff138f54f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "cd723149ede0b48f3d44977be1ef8033f3b070a037a60bbe6af475a2975f207aafa73a78bd12b272ea85cd841007cdd825f00592c7c563c5275423115442345e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "af4216cb3be0967ef5df8cb17b7e720ae4a967dc2b9695d83ceb39c48734472f25063e1e9f2b791b7893dc7a44a99658ee9374a85d33fd77b143eeb2a09e4afb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "8654d082075f93c31c1ea1feeaa7383c0103475e3e2f129a92c1f27ccdcf8a3cb72b17c380c31b5b62cb37cf3bb5be95383359c6792ed7f5657d6f7c279f2c18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "9b23dd532d029322cd686d0cf0362ebb0205dfc56499331fcaa29f038aa2671cfa6d5f395e04e47147a7870852e1d026a9a018a417bc5a5447f82acbfd9f12b9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "65358e65b06ef09431fc15f9b6d6cfef343f8bb4ba4c5f6f773f8122f15e2242f2d26a8d6953d6fb25404d68e61c166d79b00483875cefda0f097c0d75bf4cf5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "3832d0f87032cbddb0ec42518732f8fb9a253341c33159f152ebad59a7d83234d56f0fe76c48503619bb13a59f2512691d94c3a32d0e85f7874a0886ad189f2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "82972732af96b74b5f69892e7a60d3a03446cb2b048c70f3462fd10d18110c0bffd7e5a9e4b36493d35f701e38dfee7a716cb979bb087bfec7c91d12a4e7702f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "9681c8d3e09a69e32d174129b45f49d422bef74c107139e5cfc5448429692d22aeff795b3ec457b2732473f4531c6ab0a3324d235fc9ff827a5b18aaa12829fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "0ca3c8044825907e543255ba66b4679924583cfa82cc15d59afad0d58b493a899025db15d24c69da7b4c4ddb1c83980dbe6132041955475f08816465bc1b2806"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ff470ff06a878fc1237446d8a2411be11513b8431860ab02d4d7b5e617683408bd97ada6dc4a85c2607e1bb7123132bba16d3f94ce9fd989526469420ac322c1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "2ae92c249786115aba2baaf5aeb0e0b50aae1d089e42e42c332062b245c34518ba0ba26db626ebb252c976cd970fb7fa7bf161f860ff53cb4b20dec73a17d3c4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "aa9de9557d2c9da388c40fc2bda1c0bcd52e1c7a069cfa3b2936b3c32d3f8af3bf5d385428f9eafc0106f4212def5f11621a52118283f787ee823beee59ae2e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "bf2af6ba5d17ddb9112c1abbd7e3c7f5c936e7b88023b24329b1ae24b2283baa9a691a5d8f9a807ad23d679c3e37516fecf8a8fe05331e1531ee0f3edeafafab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "04406c356da280bafd94e8dfae6c0d667b15d179106a60087a8fc798a2dcb1562e279c6591ef11e4f4783025699e29868054eff96c540cf88803ef13fb658820"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "03ce9231a3a2e01ff15f5e85a729ec40a38c6424ca51858740f0dd903936e428b611e594486c25d9583987af535133705d83353198f77009862dfb56675b0a1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "a62c52e5186084d1c99f54f3f5eea6218b1d6b424e51eed851acba784d16f3845bc8d119fd03737a3404710ff9f3883676642704431d3d7df462452130d50387"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c0a627bc9760b3f7a96a5e16fa9b13a356292cbd1abc5be795eb656c1099ef8408be04b090f4f32039485ab43697f811ee5eb1f70324d79304a57cdff14b57ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3e0e840aef1063ac7c553a1bf9ba5a5db63cb2553c0af61b9401a01c84d5e6af74ec1b7b8b260471f2d40101770e9ee6bafd11c842a0eca47b28dd83314d47f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "5985b798a7d634d01a427028a847ad4f76000a8f7ed2c1c14b0a68088837bed2e157c66137408e2a0b4567fd2bd4bf63b4717d893c88aab879d8f9c583f73c5b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "b75b1119708c4bbbcd41b88747a3c2dc22b090d2920831cac56373311e1a996ad558021a85446d5d9ac762ec95cc2ef736692a3c65a20f632693d51a6c1f2ce7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "3d375b16a4785fe3af8061ca7759dbccfbeb120b8bdc35a455e411be0a961d9a65345f5aff6b0c01bb7dbcaa4d4a7173117aea52ccb5099bd4ed714f38fcce36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "66a1aaf6d1805be3f6bf4bc71bdb30b7a44e916ccabbb57fb09aec109a3bbab62a8a1a669b6c1806a7959879700a0ac6c97c196d5a75079dcc4042ed789ee922"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "11f84f8b93db54c88a3d4b0ff155ec69998033ef2cc592dc4d1736129be62249b722a2d7817f3172fe5bad2418980fb57a48d3bec656837c03580ad9e65eedc7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "c9c3d4d54e5002aec6cb202f7e1269344eea1e9b969fa972000dfc85ccd2f1aed93de52176622f055a9bc5d639b0cce60af69b4507d0f9ebcce77b34f87350c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8faeee4ed9f69c0f6b3542fa077d50ae3c432709ff1449a91d190e0880d37f849bad199c1dc6d0f6d436203a1e0f8302f6fd082f23bdd8f3338e8cd8c938d4a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "bfea8fe2273960e84dc3b3dac18d83b36cd0ec9f7d22d25733b36079cb31c76215bdc1862214fe7180229e6163154eef65aeb2b54f94895954d7ff5e4afec813"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "7995eb7ef1cc5768052bd28c86b547b60c949ce3c0f8089324af4ef0d654bce6c48750ae579f20442f5aaa0c69853290ecabe28f29f2796eacaf2af83e3bed87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "9488b18fddb35142a0a88ccc05bac3eb4ab3fc6415736d9a36d58f3bc88016ee8ce1b66e86739c34cabfcc89d2e17a46c282f9495599b8b3fc39be8e6f10b7d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "c9694b5aea764255eaa38db4091da6d9fad85d7fa1a67d1529ca66f9dd337818b21c4afda5bcd3fa11c6116bd65ef6c9cb3c7217290982ec10af5ab9b31bbcd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "d3186e2c3c3eb3b907fc34aacb9dcb55cbc8433431bb76ac2870bd6823d7261d347819d6d8ea24ac042401d76c155d7efaa00bb81f03ca2991f16aa36bb87b8f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b09296856db8af2a61ecb2cf7b27da8ee7fac4598f88be504547f912aaf367a250c66c4dccde77c74588e9319cfd802ca296fbe178b1f7442076f67690f356ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "7cdcbf8199fd98e33a509043aee60a40df1ce734067a0a519770466e7eaf20d15d7f4b9942e0b589bedb67f7ba51ac1242bc452c1f79f2449421281d00606433"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "c8431622708478816c8e0176b8f55c3ae5a32d2a94c24c6ddb059322f0747b55c85a12be869afe41f30c03d769cedbe62c097626d6554de29e47d672d0dae502"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "79d6c04f251ea26cd78c095f4dab2252162b0c1107e73642836da53504929f775403e4f1872ceb8dccbf45b5c52487c7fd2a58c182b6e006e6307d5b1f854a5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "1420ebabc1d5f95db723a1493988d3e3e07354c92256dbed3ef9505d0fd8ce7270c49fa2401de1fe9fe53992c83e81debcdff87b2163eec1ac1ab2f860d8060b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "9e42c2ed46ec6ec8c0b33a51577e841fe8bcb36fbab369ad7b65d77029f7ca06ad58fdd52343db2e34f64ec2f85224af15a8a3e43f3112beac7c7434dbcacfe9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "f7726bf8745554d426321add7fd64407d80fbe36c47ba209e837ba8de0392a7db38b386cd5b5b104484b614a497b8792985347260f4c0465878c51f5396e96fa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "cb0143438cac468d2e70bb53eff678ffb8b831a735c4af0f4aa6ae4b0d7431ff88b33d100d82c3af4d0d4d5bc79dfb8d4c4ad2f8b2ee8c0527cd998f286fe2c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e1321a23d72d292b50fada4d2e468924304787f107f4111a9c51be5a05098ecd8cb3ad6235e26ad5b60a264ad387264b0955cbd8596e8cfc6202acb937029c52"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e9dfea71269ce2bb4fd44f613477cf202aab03268c87d0cfef6c05c4c3a36d1a5cf4b5d5a2987265e21722aaf81b1217d81d94f4b79ae447a0df34cda01a2b19"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "196de192baa7abb85389257adcba33b09a1489971c6c2c92ee9166578a24aaef19fbd42fb039f671ff590ba74ba7fb1a0ffb90f2956369a14e08c04845833943"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "61f5bad2236cb7a95a9910814fe23cbbfd81e039e9ad4e7218de7f49ba6db604a1376c1a0ec42a866a2fc693778e155a821fcc654443647557899427d1e4c2ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "a823be574db87212d9f822dbaa32cfa885647ec78cf10e465033afd6cac8adeb98c4b1c3ab358d10db76b4a02a73819df28ba4e446b2e4db42c406a434a5c2d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c432aaa53bbbcfe0c38c0cd5748d0b34dfea245302407e3367b05cb35d979b16a7eb669819a62aa0cf3582ba31ce328dd21e812a129101242b1543e8782c4a97"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "5734973be02d5929354e8dd710b03367cbdc1b7b25f2341057b5e7421d3c8b5ebef7f4674015f385aaf0d8d47efed4db7f1dd17fa53220f62e15c1ecc81a9889"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "b1f9a0b32b09f2658544cea4995344b8faf0033133a84c996b65d73dca608d8260f257ed2b981a3afa761d02d0669be866c9bce7324956767e154f637b3bbcbc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "911497ec90ecdb400c7f43e711ba9e0b6ab1160288d45c3d1d293e9c847fe98167bd3400983915383ccb6f21d057374ade755b0c8e42d229cd178a2fbfd0d397"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "b2b5abc20a1fda08c2dbdbb9f0ffac768a2902db330f0646920dcc8b72052893ec59c861d8b26515143290454e20e64bef28617f79e885a9e884088c74f20138"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "5816d9f28ea308a3b5910ab718898cd6a36bb27a9f9f273970c8ba86eb7db0be2d39b7e616299c2adf84770da4d98442005d1a87503083da0970a05947cb14ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "1761fd41f5d1c413fa4f35545f5a95df91bd5625be110dc1257b9ee4b3480c2a1ce3e7294dcf4825a412b43fcbdc2da86147fb6d8b004137ae0bcec4cda2ebd2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "83f2f053b5a592fe8070d5c01d17a3ca4df988257f19e4dfd17fed6cdee3886cb42701d3aece737817e1cfae7f580c63250b404ad847dc408e2f967b7b70ee32"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "ad87b6ae4340041aa7335b69b50f3ddc4731934d25136a0815531708197db9c6b4496ce855d3ce4ec9cf942b594ebd18ccf997e28ea7e625caa7629ca5714fb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "3825405b73375aef6c391cf0e6520f3c9283178b8a2daaf3f5a287a9398c9978d90ac33066fbd114728e7805555cd440a9e2d123c62f099e71a77b13f959dc13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "221029fa0cde5873cd3908c445bdcab03cdf3fc5298203772b6157342f73be7d60e460546f373a50bb2ec308038238da5906374dad326de9f950f838e73b18a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "017bad22c732c2c5d1d1fd44dfc6423eff52f489513e05ae178c61a48376a6353243c2fa095c3acd3a8bfcc032532ef1b046600a625775e6ec5a0b408845aac2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "a38742529cfb00c78d3603aba4d1091c4c26b7a4124afe6a976487d3685e92fa3393d2b006ebd34315c9cf8e5b07e8b2e72eaf75669e1195bdcefe86331827fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0e0e785028fa438957f33f9041be50d0912ba1ba6fd4f5b12b752de9aee8883d6b02af3f62397b656ea802f9c2e0606211bfaa96d7efc47afc44cbe35e18e6ba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d9ac8495985147af065da832cccb059b211b0fe66bf171450d207daff175ee04388e499f4f70dd656590689f1fb1d21cd364045b77a96f0304632325ca2d53b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1b46da4872b9b79854dba843f1a340b01969a9c6a9142b0d39a9f9bd7b984f36fac21cf3097d75855e818f34db87792bbf6801746b5a59936b598942c387d44c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "3a9966017d4f55fe07cf31f251374281e827bdbdf6f88b65236e14e1a7cb10f09de8a8610d2d21a991896854140907d6a7e8f9caa34e22c614aa403558644e6c"; } ]; } From f0bdca82c0ce446c827f9f4b10381e558f0a9c31 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 28 Nov 2016 13:56:50 -0500 Subject: [PATCH 106/219] linuxPackages.ati_drivers_x11: patch for kernel 4.7+ (#19810) --- .../os-specific/linux/ati-drivers/default.nix | 11 +-- .../patches/4.7-arch-cpu_has_pge-v2.patch | 70 +++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 3bfd59de7ed..395850384d1 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, which +{ stdenv, lib, fetchurl, kernel ? null, which , xorg, makeWrapper, glibc, patchelf, unzip , fontconfig, freetype, mesa # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or @@ -75,9 +75,12 @@ stdenv.mkDerivation rec { ./patches/15.9-preempt.patch ./patches/15.9-sep_printf.patch ] ++ optionals ( kernel != null && - (builtins.compareVersions kernel.version "4.6") >= 0 ) + (lib.versionAtLeast kernel.version "4.6") ) [ ./patches/kernel-4.6-get_user_pages.patch - ./patches/kernel-4.6-page_cache_release-put_page.patch ]; + ./patches/kernel-4.6-page_cache_release-put_page.patch ] + ++ optionals ( kernel != null && + (lib.versionAtLeast kernel.version "4.7") ) + [ ./patches/4.7-arch-cpu_has_pge-v2.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM @@ -124,7 +127,7 @@ stdenv.mkDerivation rec { description = "ATI Catalyst display drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = licenses.unfree; - maintainers = with maintainers; [ marcweber offline jgeerds ]; + maintainers = with maintainers; [ marcweber offline jgeerds jerith666 ]; platforms = platforms.linux; hydraPlatforms = []; # Copied from the nvidia default.nix to prevent a store collision. diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch new file mode 100644 index 00000000000..cb86f5aff27 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch @@ -0,0 +1,70 @@ +diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c +--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-18 19:47:41.000000000 +0100 ++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-08-15 15:09:37.228538907 +0200 +@@ -4518,7 +4518,11 @@ + write_cr0(cr0); + wbinvd(); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + cr4 = READ_CR4(); + WRITE_CR4(cr4 & ~X86_CR4_PGE); +@@ -4532,7 +4536,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0(cr0 & 0xbfffffff); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + WRITE_CR4(cr4); + } +@@ -4559,7 +4567,11 @@ + write_cr0(cr0); + wbinvd(); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + cr4 = READ_CR4(); + WRITE_CR4(cr4 & ~X86_CR4_PGE); +@@ -4572,7 +4584,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0(cr0 & 0xbfffffff); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + WRITE_CR4(cr4); + } +diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h +--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 2015-12-18 19:47:41.000000000 +0100 ++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h 2016-08-15 15:09:05.815141238 +0200 +@@ -650,9 +650,15 @@ + #define cpu_has_pat test_bit(X86_FEATURE_PAT, (void *) &boot_cpu_data.x86_capability) + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++#ifndef boot_cpu_has(X86_FEATURE_PGE) ++#define boot_cpu_has(X86_FEATURE_PGE) test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) ++#endif ++#else + #ifndef cpu_has_pge + #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) + #endif ++#endif + + /* 2.6.29 defines pgprot_writecombine as a macro which resolves to a + * GPL-only function with the same name. So we always use our own From 076e3ae32cb40b590a50bffdcf1ee5da85bfabe9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 28 Nov 2016 14:46:47 -0500 Subject: [PATCH 107/219] gitRepo: 1.22 -> 1.23 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index ad3311d967a..001aa0c5b09 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.22"; + name = "git-repo-1.23"; src = fetchurl { # I could not find a versioned url for the 1.21 version. In case # the sha mismatches, check the homepage for new version and sha. url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha1 = "da0514e484f74648a890c0467d61ca415379f791"; + sha256 = "1i8xymxh630a7d5nkqi49nmlwk77dqn36vsygpyhri464qwz0iz1"; }; unpackPhase = "true"; From 1ac1d934272bda06f93d30ae3481fe39a269c5d5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 28 Nov 2016 17:37:32 -0500 Subject: [PATCH 108/219] atom: 1.12.5 -> 1.12.6 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 03b858c896c..572b7085cbc 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0bxv9j6v77g9sjlg6vjcxjdsgbh10v3c8f0qp5fpzr7dzk7k9w41"; + sha256 = "0b85bjfxdd18i2v8py5jx4284m58zxad38c2vvqhgx7cxm9hn8k6"; name = "${name}.deb"; }; From 80bee8ffe70cba34ea1f0098c45f65b2e761d3e3 Mon Sep 17 00:00:00 2001 From: Tikhon Jelvis Date: Mon, 28 Nov 2016 15:07:41 -0800 Subject: [PATCH 109/219] Added a check to not run patchelf on Darwin systems. --- pkgs/applications/networking/cluster/hadoop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index c5cc7ca7431..55ebb580f52 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { for n in "bin/"* "sbin/"*; do sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; ''; installPhase = '' From f44023c4852893612b3c332ac6fff0a5ea9bfef5 Mon Sep 17 00:00:00 2001 From: Ruslan Babayev Date: Mon, 28 Nov 2016 17:18:21 -0800 Subject: [PATCH 110/219] haskellPackages.barrier: jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8a8d0e84e76..0498bcb2777 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1128,4 +1128,6 @@ self: super: { # https://github.com/rampion/ReadArgs/issues/8 ReadArgs = doJailbreak super.ReadArgs; + # https://github.com/philopon/barrier/issues/3 + barrier = doJailbreak super.barrier; } From 66fb5ac222767f8650c3ea3e4de1dc81c44bb3fd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 29 Nov 2016 10:57:52 +0800 Subject: [PATCH 111/219] puddletag: 1.1.1 -> 1.2.0 --- pkgs/applications/audio/puddletag/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index b8213f4d9f4..631a5701591 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -2,19 +2,20 @@ let pypkgs = python2Packages; + pname = "puddletag"; in pypkgs.buildPythonApplication rec { - name = "puddletag-${version}"; - version = "1.1.1"; + name = "${pname}-${version}"; + version = "1.2.0"; src = fetchFromGitHub { owner = "keithgg"; - repo = "puddletag"; - rev = version; - sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx"; + repo = pname; + rev = "v${version}"; + sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; }; - sourceRoot = "${name}-src/source"; + sourceRoot = "${pname}-v${version}-src/source"; disabled = pypkgs.isPy3k; # work to support python 3 has not begun From 96dfd01966cc0af2abc1a4c2246a9659dd9fb133 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 29 Nov 2016 15:33:24 +0900 Subject: [PATCH 112/219] groonga: 6.1.0 -> 6.1.1 release notes: http://groonga.org/en/blog/2016/11/29/groonga-6.1.1.html --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index babca9af168..8dce24948fe 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb"; + sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ From f67061c1de847f310d1569cfabf98fef8fb09d4e Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Fri, 25 Nov 2016 09:46:40 +0100 Subject: [PATCH 113/219] (rustc-nightly) init at 2016-11-26 - precompiled rustc nightly binary --- .../development/compilers/rust/nightlyBin.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/compilers/rust/nightlyBin.nix diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix new file mode 100644 index 00000000000..eff5db9143f --- /dev/null +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper, cacert, zlib }: + +let + inherit (stdenv.lib) optionalString; + + platform = if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else abort "missing boostrap url for platform ${stdenv.system}"; + + bootstrapHash = + if stdenv.system == "x86_64-linux" + then "1hsvf1vj18fqxkqw8jhnwahhk2q5xcl5396czr034fphmp5n4haw" + else throw "missing boostrap hash for platform ${stdenv.system}"; + + needsPatchelf = stdenv.isLinux; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/${version}/rustc-nightly-${platform}.tar.gz"; + sha256 = bootstrapHash; + }; + + version = "2016-11-26"; +in + +rec { + rustc = stdenv.mkDerivation rec { + name = "rustc-nightly-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ makeWrapper ]; + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=rustc + + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + ''} + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track dow. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c3..187e8de8e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5215,6 +5215,8 @@ in }; rust = rustStable; + rustcNightlyBin = lowPrio(callPackage ../development/compilers/rust/nightlyBin.nix {}); + rustcNightlyBin-2016-11-26 = rustcNightlyBin; rustStable = callPackage ../development/compilers/rust {}; rustBeta = callPackage ../development/compilers/rust/beta.nix {}; rustUnstable = callPackage ../development/compilers/rust/head.nix { From 66c3818e988fe3066d0306c73cf6e6f538e1119a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 29 Nov 2016 07:02:11 -0600 Subject: [PATCH 114/219] kde5.frameworks: 5.27 -> 5.28 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../kde-frameworks/plasma-framework.nix | 7 - .../libraries/kde-frameworks/srcs.nix | 584 +++++++++--------- 3 files changed, 297 insertions(+), 296 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 365d44c5e39..20d63af5126 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.27/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.28/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index fe5ba503a40..389b7fc452b 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -8,13 +8,6 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - (fetchurl { - url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5"; - sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f"; - name = "plasma-framework-osd-no-dialog.patch"; - }) - ]; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 4891c1bc07b..eebba2d6a8c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,579 +3,587 @@ { attica = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/attica-5.27.0.tar.xz"; - sha256 = "0w6dwq83vj70m8rf52x60a64f6s6h0y7c948j3hddfql7s3ghha7"; - name = "attica-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/attica-5.28.0.tar.xz"; + sha256 = "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks"; + name = "attica-5.28.0.tar.xz"; }; }; baloo = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/baloo-5.27.0.tar.xz"; - sha256 = "0dqa5sxz2z440h6zry7s1x0r1d919qky69i5fv2nir7y844xx2cc"; - name = "baloo-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/baloo-5.28.0.tar.xz"; + sha256 = "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5"; + name = "baloo-5.28.0.tar.xz"; }; }; bluez-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/bluez-qt-5.27.0.tar.xz"; - sha256 = "111gqxw1bvazdhxk5rcfhi438i6bd92r3wvlkxsdqrp7ypcqdpig"; - name = "bluez-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/bluez-qt-5.28.0.tar.xz"; + sha256 = "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9"; + name = "bluez-qt-5.28.0.tar.xz"; }; }; breeze-icons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/breeze-icons-5.27.0.tar.xz"; - sha256 = "12awfvka9sgdgh7dyg7cw7myw7fxrx1w93s1gyhdq2drjsdbghgz"; - name = "breeze-icons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/breeze-icons-5.28.0.tar.xz"; + sha256 = "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2"; + name = "breeze-icons-5.28.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/extra-cmake-modules-5.27.0.tar.xz"; - sha256 = "0n7vw2a4kxdgpsc1wn9f1d0y01p6qfk8ac360rq329bvdpigxmnj"; - name = "extra-cmake-modules-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/extra-cmake-modules-5.28.0.tar.xz"; + sha256 = "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h"; + name = "extra-cmake-modules-5.28.0.tar.xz"; }; }; frameworkintegration = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/frameworkintegration-5.27.0.tar.xz"; - sha256 = "0zpv7wj2006f039wr1gp5bc4md8yq9ig5g3v5mx46sdjip5423p1"; - name = "frameworkintegration-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/frameworkintegration-5.28.0.tar.xz"; + sha256 = "1bcjryngmmyransd5y3zd5ygri13fyy6z7piz3ai9lqmcdbwf7qn"; + name = "frameworkintegration-5.28.0.tar.xz"; }; }; kactivities = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kactivities-5.27.0.tar.xz"; - sha256 = "08x07rlf2gff1j9jahznz2838919vab1ay8jppz3bp5kywx104yk"; - name = "kactivities-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kactivities-5.28.0.tar.xz"; + sha256 = "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb"; + name = "kactivities-5.28.0.tar.xz"; }; }; kactivities-stats = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kactivities-stats-5.27.0.tar.xz"; - sha256 = "134a3zgasza9wghp1lkiaar3sakag7vn82pm2kcrmr420a0jigsw"; - name = "kactivities-stats-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kactivities-stats-5.28.0.tar.xz"; + sha256 = "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v"; + name = "kactivities-stats-5.28.0.tar.xz"; }; }; kapidox = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kapidox-5.27.0.tar.xz"; - sha256 = "193m0qpcqdkspdcwc8cwabjjcqyd9d0m5kl53mycyiv1m220x11l"; - name = "kapidox-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kapidox-5.28.0.tar.xz"; + sha256 = "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq"; + name = "kapidox-5.28.0.tar.xz"; }; }; karchive = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/karchive-5.27.0.tar.xz"; - sha256 = "1c7bifmzyr398p1qx9qfxp893wbr44sjn3sda9q0hdpmw2i7yf3z"; - name = "karchive-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/karchive-5.28.0.tar.xz"; + sha256 = "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7"; + name = "karchive-5.28.0.tar.xz"; }; }; kauth = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kauth-5.27.0.tar.xz"; - sha256 = "17z6dh1qdpd490z84g6ynl8bcrr9naalvh34ybnpipvx3qs50kwl"; - name = "kauth-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kauth-5.28.0.tar.xz"; + sha256 = "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40"; + name = "kauth-5.28.0.tar.xz"; }; }; kbookmarks = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kbookmarks-5.27.0.tar.xz"; - sha256 = "1lb20yn8s27h0965yf6w4v4wwlm80bl24mpsksp01z9f0711j8vm"; - name = "kbookmarks-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kbookmarks-5.28.0.tar.xz"; + sha256 = "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65"; + name = "kbookmarks-5.28.0.tar.xz"; }; }; kcmutils = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcmutils-5.27.0.tar.xz"; - sha256 = "04nbd0836azs2i0pq8hq8ljnmfc45mqs022zdn84xd2q3npl3hfx"; - name = "kcmutils-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcmutils-5.28.0.tar.xz"; + sha256 = "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa"; + name = "kcmutils-5.28.0.tar.xz"; }; }; kcodecs = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcodecs-5.27.0.tar.xz"; - sha256 = "0f4k276sm0svh5y8yyq8hfc5vy60cpsrwany7kswyh22m57v5j8a"; - name = "kcodecs-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcodecs-5.28.0.tar.xz"; + sha256 = "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3"; + name = "kcodecs-5.28.0.tar.xz"; }; }; kcompletion = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcompletion-5.27.0.tar.xz"; - sha256 = "1mb64ii4ilhqhy9p6cl3phs17bg3lr4b60jkkm71yn2wnd4wl47s"; - name = "kcompletion-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcompletion-5.28.0.tar.xz"; + sha256 = "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f"; + name = "kcompletion-5.28.0.tar.xz"; }; }; kconfig = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kconfig-5.27.0.tar.xz"; - sha256 = "18dpm0r4nnvmxrask6rv5dkniwna9hh72ffdnvjgrh8p5djs9szi"; - name = "kconfig-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kconfig-5.28.0.tar.xz"; + sha256 = "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy"; + name = "kconfig-5.28.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kconfigwidgets-5.27.0.tar.xz"; - sha256 = "0sbhirfsjmsxiwaqqh5jh85bhwmij93gj5knnb0bs0al4hy29918"; - name = "kconfigwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kconfigwidgets-5.28.0.tar.xz"; + sha256 = "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d"; + name = "kconfigwidgets-5.28.0.tar.xz"; }; }; kcoreaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcoreaddons-5.27.0.tar.xz"; - sha256 = "0rzpxajv041kdbk92rwxq1qnvzyrxfjy154d8257yj2fj76w1gnw"; - name = "kcoreaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcoreaddons-5.28.0.tar.xz"; + sha256 = "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb"; + name = "kcoreaddons-5.28.0.tar.xz"; }; }; kcrash = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcrash-5.27.0.tar.xz"; - sha256 = "09wf4dzckc9l8dyl8qs1wc54h4rm38i2blzyyicm4iazi420lysk"; - name = "kcrash-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcrash-5.28.0.tar.xz"; + sha256 = "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv"; + name = "kcrash-5.28.0.tar.xz"; }; }; kdbusaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdbusaddons-5.27.0.tar.xz"; - sha256 = "1vgdl9z5xyfr2b5z7n2vdh0s6zab6ccxp30p1cy8hhhrsf04663m"; - name = "kdbusaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdbusaddons-5.28.0.tar.xz"; + sha256 = "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8"; + name = "kdbusaddons-5.28.0.tar.xz"; }; }; kdeclarative = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdeclarative-5.27.0.tar.xz"; - sha256 = "1a8pqwrwgmzarinhr9xxviqh9417p8icj8lwqg9ly0q0j3yv20dh"; - name = "kdeclarative-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdeclarative-5.28.0.tar.xz"; + sha256 = "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn"; + name = "kdeclarative-5.28.0.tar.xz"; }; }; kded = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kded-5.27.0.tar.xz"; - sha256 = "14f4qxia9p3vynv2ch9rs67zaxn9kpbas0fn0vwag1ikxb8qz0c2"; - name = "kded-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kded-5.28.0.tar.xz"; + sha256 = "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5"; + name = "kded-5.28.0.tar.xz"; }; }; kdelibs4support = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kdelibs4support-5.27.0.tar.xz"; - sha256 = "17b8d5b9w27251k4r5xc17115nc3k1agv7j7gkmdiybjyilj1n91"; - name = "kdelibs4support-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kdelibs4support-5.28.0.tar.xz"; + sha256 = "1l6r2812173p8svazq7sam8c2pgh83hdwf35hv3qn7qw30dpg8jl"; + name = "kdelibs4support-5.28.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdesignerplugin-5.27.0.tar.xz"; - sha256 = "157lny5v8js63nvw2iyc9j4cinqmyj75a389s46n8wqyygrz5v0v"; - name = "kdesignerplugin-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdesignerplugin-5.28.0.tar.xz"; + sha256 = "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3"; + name = "kdesignerplugin-5.28.0.tar.xz"; }; }; kdesu = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdesu-5.27.0.tar.xz"; - sha256 = "1l501z102ygibz4000jnngm0cggh2kaf6hzra1ngv5nxqxzkh31a"; - name = "kdesu-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdesu-5.28.0.tar.xz"; + sha256 = "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp"; + name = "kdesu-5.28.0.tar.xz"; }; }; kdewebkit = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdewebkit-5.27.0.tar.xz"; - sha256 = "0ff6xnfc5airadk32s2d3jmmmzilgnwc9r6bvmvnai0f7c4db48f"; - name = "kdewebkit-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdewebkit-5.28.0.tar.xz"; + sha256 = "19nq6dghnxdzq6xbry283gijsvnzpgp4sl5l3b6xi9n1iq4f91w9"; + name = "kdewebkit-5.28.0.tar.xz"; }; }; kdnssd = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdnssd-5.27.0.tar.xz"; - sha256 = "0dq2i4f4ny5cwgd41mjw5i7cf23ns55s2m13cjvxvy90nwhlymqp"; - name = "kdnssd-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdnssd-5.28.0.tar.xz"; + sha256 = "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r"; + name = "kdnssd-5.28.0.tar.xz"; }; }; kdoctools = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdoctools-5.27.0.tar.xz"; - sha256 = "1hgg19da0918mx8z2614qljvj9j8bny78mwlyljf42814f3ycpam"; - name = "kdoctools-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdoctools-5.28.0.tar.xz"; + sha256 = "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c"; + name = "kdoctools-5.28.0.tar.xz"; }; }; kemoticons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kemoticons-5.27.0.tar.xz"; - sha256 = "0rjw2g3lfdxiy56x61d0sdcmcs8rml6h29a05fp6xww2bqcvr9wq"; - name = "kemoticons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kemoticons-5.28.0.tar.xz"; + sha256 = "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv"; + name = "kemoticons-5.28.0.tar.xz"; }; }; kfilemetadata = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kfilemetadata-5.27.0.tar.xz"; - sha256 = "1la6h05izgnps10py2gcn4xnwz3fm7dyswib57flc8phzipxbg5q"; - name = "kfilemetadata-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kfilemetadata-5.28.0.tar.xz"; + sha256 = "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6"; + name = "kfilemetadata-5.28.0.tar.xz"; }; }; kglobalaccel = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kglobalaccel-5.27.0.tar.xz"; - sha256 = "1z2knfxcla1f191cifij1fzw88b076yx6qjxraqfsmkc6g6i2bmj"; - name = "kglobalaccel-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kglobalaccel-5.28.0.tar.xz"; + sha256 = "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc"; + name = "kglobalaccel-5.28.0.tar.xz"; }; }; kguiaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kguiaddons-5.27.0.tar.xz"; - sha256 = "1skvlcj0fgb4am02vlm4fyd52f9yn4y0aj5arcfz3qps5cjzr6xg"; - name = "kguiaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kguiaddons-5.28.0.tar.xz"; + sha256 = "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f"; + name = "kguiaddons-5.28.0.tar.xz"; }; }; khtml = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/khtml-5.27.0.tar.xz"; - sha256 = "05ssmgk2gr5v1x1lsvyyspvnlknmkxivgx1g210i9ayl08v8v3c0"; - name = "khtml-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/khtml-5.28.0.tar.xz"; + sha256 = "17dgxicfbpik65m2bjc07qnp2s54wj4zx4czci7v9chfy23d52sb"; + name = "khtml-5.28.0.tar.xz"; }; }; ki18n = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ki18n-5.27.0.tar.xz"; - sha256 = "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff"; - name = "ki18n-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ki18n-5.28.0.tar.xz"; + sha256 = "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw"; + name = "ki18n-5.28.0.tar.xz"; }; }; kiconthemes = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kiconthemes-5.27.0.tar.xz"; - sha256 = "0m70vcrxp0vvqw5grlsn19d2hgdhky8iv2pr0xwzw8v5yrnl1hh2"; - name = "kiconthemes-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kiconthemes-5.28.0.tar.xz"; + sha256 = "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc"; + name = "kiconthemes-5.28.0.tar.xz"; }; }; kidletime = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kidletime-5.27.0.tar.xz"; - sha256 = "1cv6d2vylz7vymn4v0brv2jp1kzscvm9wh1ylp3wyi1jqyblgjfw"; - name = "kidletime-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kidletime-5.28.0.tar.xz"; + sha256 = "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7"; + name = "kidletime-5.28.0.tar.xz"; }; }; kimageformats = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kimageformats-5.27.0.tar.xz"; - sha256 = "0ijy7di9p37l6fjrmsday402vq4zibq1m37jghkvdymawxcrd22h"; - name = "kimageformats-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kimageformats-5.28.0.tar.xz"; + sha256 = "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra"; + name = "kimageformats-5.28.0.tar.xz"; }; }; kinit = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kinit-5.27.0.tar.xz"; - sha256 = "0sbpl1sp1ajarjmnvx2l3dr09afsay28kp2sf4yacrm4lrmhwzip"; - name = "kinit-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kinit-5.28.0.tar.xz"; + sha256 = "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912"; + name = "kinit-5.28.0.tar.xz"; }; }; kio = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kio-5.27.0.tar.xz"; - sha256 = "129sglaw1480v3i1xdyv6k1w3spbj8s00rkdr5mzlcdaqiig69rn"; - name = "kio-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kio-5.28.0.tar.xz"; + sha256 = "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia"; + name = "kio-5.28.0.tar.xz"; }; }; kitemmodels = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kitemmodels-5.27.0.tar.xz"; - sha256 = "00qgp5i35r7k9gy43wypn9fa7zxiqqip89dzbw8r6rabinihqzy2"; - name = "kitemmodels-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kitemmodels-5.28.0.tar.xz"; + sha256 = "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z"; + name = "kitemmodels-5.28.0.tar.xz"; }; }; kitemviews = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kitemviews-5.27.0.tar.xz"; - sha256 = "1469i10y2c3i1pdhzl9nk177y4n1mlc7p5w7kivdcrvf9ilxvbkx"; - name = "kitemviews-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kitemviews-5.28.0.tar.xz"; + sha256 = "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p"; + name = "kitemviews-5.28.0.tar.xz"; }; }; kjobwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kjobwidgets-5.27.0.tar.xz"; - sha256 = "05c6jzl2a37bfz5i7hzsjmrhh8ajx1gbz7j05wgal811m5m4ww8l"; - name = "kjobwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kjobwidgets-5.28.0.tar.xz"; + sha256 = "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a"; + name = "kjobwidgets-5.28.0.tar.xz"; }; }; kjs = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kjs-5.27.0.tar.xz"; - sha256 = "18x4az3v4pbg77sxhmrdrfwrc9d9fw7l40m6p18k1khxn86hsp9j"; - name = "kjs-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kjs-5.28.0.tar.xz"; + sha256 = "0w6zijdk4rabsda9msp5dd2kgg8xrh000chmx17xjqa661bgsfql"; + name = "kjs-5.28.0.tar.xz"; }; }; kjsembed = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kjsembed-5.27.0.tar.xz"; - sha256 = "1j42v2l41mwn0ms29b94py21dh7kiipkgdnigpbn89v7nkhwlq2b"; - name = "kjsembed-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kjsembed-5.28.0.tar.xz"; + sha256 = "0mgcdpmk7sprxk58c63b9c5maz9pyi4b77332ci4ixz9pi94899j"; + name = "kjsembed-5.28.0.tar.xz"; }; }; kmediaplayer = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kmediaplayer-5.27.0.tar.xz"; - sha256 = "003jvd2lzp70ywhnkpzgalzqkjpy3d9flkl144z2hfdwm011d58x"; - name = "kmediaplayer-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kmediaplayer-5.28.0.tar.xz"; + sha256 = "139fbhqdhg2pgqadfbig27cnh2p9bds50c0nc9b6pnrwlirl7sm2"; + name = "kmediaplayer-5.28.0.tar.xz"; }; }; knewstuff = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knewstuff-5.27.0.tar.xz"; - sha256 = "05ikb7cvyx3cmrrjh2ss6439a49vmzbi3chjj23ffdz2nd2k7r2f"; - name = "knewstuff-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knewstuff-5.28.0.tar.xz"; + sha256 = "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3"; + name = "knewstuff-5.28.0.tar.xz"; }; }; knotifications = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knotifications-5.27.0.tar.xz"; - sha256 = "09v122nxfgqjzr2azfn2nh4q9l22i5wnsz9prs0i7s3m7y0d7pxn"; - name = "knotifications-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knotifications-5.28.0.tar.xz"; + sha256 = "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s"; + name = "knotifications-5.28.0.tar.xz"; }; }; knotifyconfig = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knotifyconfig-5.27.0.tar.xz"; - sha256 = "088p19ynjs79zf7mq3gkds93dg72jj8pfya53xyhzdg8s6vyns9n"; - name = "knotifyconfig-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knotifyconfig-5.28.0.tar.xz"; + sha256 = "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f"; + name = "knotifyconfig-5.28.0.tar.xz"; }; }; kpackage = { - version = "5.27.0"; + version = "5.28.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpackage-5.27.0.tar.xz"; - sha256 = "0y07zh8ryibm69ljp9f169qfal6r4lngz1ljxgrr6qw15cjkjygk"; - name = "kpackage-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpackage-5.28.1.tar.xz"; + sha256 = "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp"; + name = "kpackage-5.28.1.tar.xz"; }; }; kparts = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kparts-5.27.0.tar.xz"; - sha256 = "0rfsyr96s59ljp3jgmcwlvwzbgmlx7fvr62xswwmsnb8ah14k5rh"; - name = "kparts-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kparts-5.28.0.tar.xz"; + sha256 = "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik"; + name = "kparts-5.28.0.tar.xz"; }; }; kpeople = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpeople-5.27.0.tar.xz"; - sha256 = "1w6sbd6djcpv36m9my4drqkrs1l3cryshpz1dx9z8p7afr296n8j"; - name = "kpeople-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpeople-5.28.0.tar.xz"; + sha256 = "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp"; + name = "kpeople-5.28.0.tar.xz"; }; }; kplotting = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kplotting-5.27.0.tar.xz"; - sha256 = "1qp9q8g9yxy359bylyqyqxjq9wjismajrg4xhxx5xn4s6znyrxny"; - name = "kplotting-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kplotting-5.28.0.tar.xz"; + sha256 = "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2"; + name = "kplotting-5.28.0.tar.xz"; }; }; kpty = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpty-5.27.0.tar.xz"; - sha256 = "06pka8cbw6a9rk2j5pkz34rfy10bv6il3wqyf7ala32ynv5rcgc3"; - name = "kpty-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpty-5.28.0.tar.xz"; + sha256 = "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn"; + name = "kpty-5.28.0.tar.xz"; }; }; kross = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kross-5.27.0.tar.xz"; - sha256 = "13karf890afk3dplxgsjx48vjz1ka12pgsi8qw369xbff5nqy2vj"; - name = "kross-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kross-5.28.0.tar.xz"; + sha256 = "06qx87v090d5wxbpqj2sgwhpha7gqmamdx4zffdvc0xa6g1mm6x4"; + name = "kross-5.28.0.tar.xz"; }; }; krunner = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/krunner-5.27.0.tar.xz"; - sha256 = "1yyxyippmn0d9ycj1hdjvhl1zd31yxwg89a9zwmj8v8gdfr9flj9"; - name = "krunner-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/krunner-5.28.0.tar.xz"; + sha256 = "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9"; + name = "krunner-5.28.0.tar.xz"; }; }; kservice = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kservice-5.27.0.tar.xz"; - sha256 = "129bjdr272qkz2inmagy8jnxasifrl4d82x8rp9akfar29qsj6x6"; - name = "kservice-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kservice-5.28.0.tar.xz"; + sha256 = "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l"; + name = "kservice-5.28.0.tar.xz"; }; }; ktexteditor = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ktexteditor-5.27.0.tar.xz"; - sha256 = "127wp4dg72skd6abn2vqffxg91bn59z8yxwy6lxyzvck2pc5v1ss"; - name = "ktexteditor-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ktexteditor-5.28.0.tar.xz"; + sha256 = "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq"; + name = "ktexteditor-5.28.0.tar.xz"; }; }; ktextwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ktextwidgets-5.27.0.tar.xz"; - sha256 = "0aq2qx64wylxj5q5sr0dxv9h8bmn725llxyi7iwz31dg2ngfr7m4"; - name = "ktextwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ktextwidgets-5.28.0.tar.xz"; + sha256 = "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp"; + name = "ktextwidgets-5.28.0.tar.xz"; }; }; kunitconversion = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kunitconversion-5.27.0.tar.xz"; - sha256 = "11rn6813jz7clb6fjp9nbdg1c350zh0yiprbr053wkdjrb3aca7c"; - name = "kunitconversion-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kunitconversion-5.28.0.tar.xz"; + sha256 = "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q"; + name = "kunitconversion-5.28.0.tar.xz"; }; }; kwallet = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwallet-5.27.0.tar.xz"; - sha256 = "1mlrkzvbqk6r43yqrvv6jsc66brzjd321fp7mg7g3ny47va7hbc2"; - name = "kwallet-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwallet-5.28.0.tar.xz"; + sha256 = "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm"; + name = "kwallet-5.28.0.tar.xz"; }; }; kwayland = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwayland-5.27.0.tar.xz"; - sha256 = "0va1kmki2xr4mx2918h333mfkqs5v1mhbzyf71hq190izdz0jdss"; - name = "kwayland-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwayland-5.28.0.tar.xz"; + sha256 = "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k"; + name = "kwayland-5.28.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwidgetsaddons-5.27.0.tar.xz"; - sha256 = "0p9gxna7y7nigpi0ri7k45g4pf1svq0kxrhk4wf7rj58rilhcfrl"; - name = "kwidgetsaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwidgetsaddons-5.28.0.tar.xz"; + sha256 = "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn"; + name = "kwidgetsaddons-5.28.0.tar.xz"; }; }; kwindowsystem = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwindowsystem-5.27.0.tar.xz"; - sha256 = "0w49lpwicl71gyyf2aisvmfjpvjl3w1rqpx4a42ph0aywjihjmhx"; - name = "kwindowsystem-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwindowsystem-5.28.0.tar.xz"; + sha256 = "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i"; + name = "kwindowsystem-5.28.0.tar.xz"; }; }; kxmlgui = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kxmlgui-5.27.0.tar.xz"; - sha256 = "0hf55ip2irbsbg59r36njgb0h5ygpaspa4x6jfyi4bxj852c3hw1"; - name = "kxmlgui-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kxmlgui-5.28.0.tar.xz"; + sha256 = "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac"; + name = "kxmlgui-5.28.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kxmlrpcclient-5.27.0.tar.xz"; - sha256 = "17bavm8qj4r1kc67x5g20v1pl8arjqpn69hg7icp2b1b0vnfvav1"; - name = "kxmlrpcclient-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kxmlrpcclient-5.28.0.tar.xz"; + sha256 = "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1"; + name = "kxmlrpcclient-5.28.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/modemmanager-qt-5.27.0.tar.xz"; - sha256 = "1zw5frscvbsp0jpb071ssqgvm097ylw3zy69y7f0dybhps6lv2jv"; - name = "modemmanager-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/modemmanager-qt-5.28.0.tar.xz"; + sha256 = "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq"; + name = "modemmanager-qt-5.28.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/networkmanager-qt-5.27.0.tar.xz"; - sha256 = "0fnj0b2j4v51f12b3v59psdza2krdkidj22b9a9jwn224lg4852y"; - name = "networkmanager-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/networkmanager-qt-5.28.0.tar.xz"; + sha256 = "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602"; + name = "networkmanager-qt-5.28.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/oxygen-icons5-5.27.0.tar.xz"; - sha256 = "1lb09ykj5ayj5lv7w2k2pqis7z61clr3gkinf6n7jghnlc96222g"; - name = "oxygen-icons5-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/oxygen-icons5-5.28.0.tar.xz"; + sha256 = "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp"; + name = "oxygen-icons5-5.28.0.tar.xz"; }; }; plasma-framework = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/plasma-framework-5.27.0.tar.xz"; - sha256 = "11apg7h636dshswikjpz0qkapv8izqjjz47k7vs49x0byp802s5i"; - name = "plasma-framework-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/plasma-framework-5.28.0.tar.xz"; + sha256 = "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q"; + name = "plasma-framework-5.28.0.tar.xz"; }; }; solid = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/solid-5.27.0.tar.xz"; - sha256 = "01qlfj30n8sr8xd8l8fimg7hs7h70ynhalk2m9l8dz2qay2pdl27"; - name = "solid-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/solid-5.28.0.tar.xz"; + sha256 = "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy"; + name = "solid-5.28.0.tar.xz"; }; }; sonnet = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/sonnet-5.27.0.tar.xz"; - sha256 = "07i3gng309vsf5kp5dlwca0lpi3iqc0lp0ixdvx75q832gk8ivrv"; - name = "sonnet-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/sonnet-5.28.0.tar.xz"; + sha256 = "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8"; + name = "sonnet-5.28.0.tar.xz"; + }; + }; + syntax-highlighting = { + version = "5.28.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.28/syntax-highlighting-5.28.0.tar.xz"; + sha256 = "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy"; + name = "syntax-highlighting-5.28.0.tar.xz"; }; }; threadweaver = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/threadweaver-5.27.0.tar.xz"; - sha256 = "0mg5i125b008x6162a5h2q14fg81m17md00017n09xljw3099kqy"; - name = "threadweaver-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/threadweaver-5.28.0.tar.xz"; + sha256 = "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5"; + name = "threadweaver-5.28.0.tar.xz"; }; }; } From 2f0cc0d3f055d64ca3f4c8664c12e8f02a833d0d Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Sat, 10 Sep 2016 15:24:57 +0200 Subject: [PATCH 115/219] unclutter-xfixes service: init Closes #18398 --- nixos/modules/module-list.nix | 1 + .../modules/services/x11/unclutter-xfixes.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 nixos/modules/services/x11/unclutter-xfixes.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 16d723bf564..5ae69ffd223 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -524,6 +524,7 @@ ./services/x11/colord.nix ./services/x11/compton.nix ./services/x11/unclutter.nix + ./services/x11/unclutter-xfixes.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix new file mode 100644 index 00000000000..bd02c5ed989 --- /dev/null +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.unclutter-xfixes; + +in { + options.services.unclutter-xfixes = { + + enable = mkOption { + description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; + type = types.bool; + default = false; + example = true; + }; + + package = mkOption { + description = "unclutter-xfixes derivation to use."; + type = types.package; + default = pkgs.unclutter-xfixes; + defaultText = "pkgs.unclutter-xfixes"; + }; + + timeout = mkOption { + description = "Number of seconds before the cursor is marked inactive."; + type = types.int; + default = 1; + }; + + threshold = mkOption { + description = "Minimum number of pixels considered cursor movement."; + type = types.int; + default = 1; + }; + + extraOptions = mkOption { + description = "More arguments to pass to the unclutter-xfixes command."; + type = types.listOf types.str; + default = []; + example = [ "exclude-root" "ignore-scrolling" "fork" ]; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.unclutter-xfixes = { + description = "unclutter-xfixes"; + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = '' + ${cfg.package}/bin/unclutter \ + --timeout ${toString cfg.timeout} \ + --jitter ${toString (cfg.threshold - 1)} \ + ${concatMapStrings (x: " --"+x) cfg.extraOptions} \ + ''; + serviceConfig.RestartSec = 3; + serviceConfig.Restart = "always"; + }; + }; +} From b04e23bbb8fa254c6b438ccc7f9c7bccd723356e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 29 Nov 2016 08:33:44 -0500 Subject: [PATCH 116/219] firefox: 50.0 -> 5.0.1 for CVE-2016-9078 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index e0689206382..15849b1f1ed 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.0"; - sha512 = "cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76"; + version = "50.0.1"; + sha512 = "3gz7z5vk5zzwy6zzay4s72rbjmlgdgbij859ppzx6h38vhljj4vl7s9g5rg2byx9vjar593i9jhx46mr8bzr3530291aq8a7qmss4hw"; }; firefox-esr-unwrapped = common { From e710edeecfd6152c0b67357555663e5dbec2c787 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Tue, 29 Nov 2016 10:31:07 -0400 Subject: [PATCH 117/219] make the /nix/store writable under netboot images --- nixos/modules/installer/netboot/netboot.nix | 28 ++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 366591a8114..5908ff6cb94 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -26,11 +26,6 @@ with lib; # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - boot.initrd.postMountCommands = '' - mkdir -p /mnt-root/nix/store - mount -t squashfs /nix-store.squashfs /mnt-root/nix/store - ''; - # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; @@ -42,13 +37,34 @@ with lib; options = [ "mode=0755" ]; }; + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. + fileSystems."/nix/.ro-store" = + { fsType = "squashfs"; + device = "../nix-store.squashfs"; + options = [ "loop" ]; + neededForBoot = true; + }; + + fileSystems."/nix/.rw-store" = + { fsType = "tmpfs"; + options = [ "mode=0755" ]; + neededForBoot = true; + }; + + fileSystems."/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; + }; + boot.initrd.availableKernelModules = [ "squashfs" ]; boot.initrd.kernelModules = [ "loop" ]; # Closures to be copied to the Nix store, namely the init # script and the top-level system configuration directory. - netboot.storeContents = + netboot.storeContents = [ config.system.build.toplevel ]; # Create the squashfs image that contains the Nix store. From c9b8a6585df2f3ac0c8713b4efc4eaaf72e7b52f Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Tue, 29 Nov 2016 17:32:21 +0300 Subject: [PATCH 118/219] Add tools/networking/polysh --- pkgs/tools/networking/polysh/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/polysh/default.nix diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix new file mode 100644 index 00000000000..b94ec8e429f --- /dev/null +++ b/pkgs/tools/networking/polysh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, python2Packages }: + +let + inherit (python2Packages) buildPythonApplication; +in +buildPythonApplication rec { + name = "polysh-${version}"; + version = "0.4"; + src = fetchurl { + url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2"; + sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; + }; + + meta = { + description = "A tool to aggregate several remote shells into one"; + longDescription = '' + Polysh is a tool to aggregate several remote shells into one. It + is used to launch an interactive remote shell on many machines + at once. + ''; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + homepage = http://guichaz.free.fr/polysh/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187e8de8e7c..d8c427744e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3330,6 +3330,8 @@ in polkit_gnome = callPackage ../tools/security/polkit-gnome { }; + polysh = callPackage ../tools/networking/polysh { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; From e43f2fc868f00db1f225aa4e9ee325d4ba7f4368 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 15:38:08 +0100 Subject: [PATCH 119/219] Revert "lxc: 2.0.4 -> 2.0.6" This reverts commit 5d804566dfecaa3928893244399b86453edcacb3. This was an error on my part. I had the commit sitting on my local master and pulled upstream to rebase my commit before pushing. I didn't notice there was a commit bumping lxc and the auto-merge on the rebase. --- pkgs/os-specific/linux/lxc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 79f6b4d5043..3c413ca2426 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" - "bashcompdir=\${out}/etc/bash_completion.d" ]; postInstall = '' From 75f131da02c00027b9a8240fb74d117cb0f9d9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 29 Nov 2016 15:55:33 +0100 Subject: [PATCH 120/219] acme: ensure nginx challenges directory is writeable --- nixos/modules/security/acme.nix | 1 + nixos/modules/security/acme.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 12736e57b4a..726e5471141 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -178,6 +178,7 @@ in path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' + chown '${data.user}:${data.group}' '${cfg.directory}' if [ ! -d '${cpath}' ]; then mkdir '${cpath}' fi diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 226cf0382da..6fddb27e6a3 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -75,7 +75,7 @@ options for the security.acme module. security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; + webroot = config.security.acme.directory + "/acme-challenge"; email = "foo@example.com"; user = "nginx"; group = "nginx"; From 88063446186da227a995d8d9432b5bda10f3dc3a Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Fri, 25 Nov 2016 09:46:40 +0100 Subject: [PATCH 121/219] rust: Updates & rename `rustUnstable` to `rustNighly`. --- pkgs/development/compilers/rust/beta.nix | 16 ++++++------ pkgs/development/compilers/rust/default.nix | 2 +- .../compilers/rust/{head.nix => nightly.nix} | 12 ++++----- .../development/compilers/rust/nightlyBin.nix | 6 ----- .../patches/disable-lockfile-check-beta.patch | 25 +++++++++++++++++++ .../disable-lockfile-check-nightly.patch | 25 +++++++++++++++++++ ...ch => disable-lockfile-check-stable.patch} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++--- 9 files changed, 69 insertions(+), 24 deletions(-) rename pkgs/development/compilers/rust/{head.nix => nightly.nix} (68%) create mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch create mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch rename pkgs/development/compilers/rust/patches/{disable-lockfile-check.patch => disable-lockfile-check-stable.patch} (100%) diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index db19391575f..a4e55f970eb 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -3,13 +3,13 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "beta-2016-08-17"; + shortVersion = "beta-2016-11-16"; forceBundledLLVM = false; configureFlags = [ "--release-channel=beta" ]; - srcRev = "822166b842e4d0b32fafc8b077fb927ec281253d"; - srcSha = "1zkv7hyjvcj7kvbngf309skgllk6rd7727a6hkvhd3hg8jlz0d00"; + srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d"; + srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; @@ -18,10 +18,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "beta-2016-07-25"; - srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; - srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + version = "0.14.0"; + srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; + srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; + depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index dd2d47e940d..c090cc07d01 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -15,7 +15,7 @@ rec { srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-stable.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/nightly.nix similarity index 68% rename from pkgs/development/compilers/rust/head.nix rename to pkgs/development/compilers/rust/nightly.nix index 2288a360a51..81741105e26 100644 --- a/pkgs/development/compilers/rust/head.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -3,13 +3,13 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "master-1.13.0"; + shortVersion = "nightly-2016-11-23"; forceBundledLLVM = false; configureFlags = [ "--release-channel=nightly" ]; - srcRev = "308824acecf902f2b6a9c1538bde0324804ba68e"; - srcSha = "17zv1a27a7w6n3a22brriqx5m6i4s3nsj7mlnpliwghlbz8q7384"; + srcRev = "d5814b03e652043be607f96e24709e06c2b55429"; + srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-nightly.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; @@ -18,10 +18,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "master-2016-07-25"; + version = "nightly-2016-07-25"; srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index eff5db9143f..47d918ddf3e 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -48,12 +48,6 @@ rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" ''} - - # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc - # (or similar) here. It causes strange effects where rustc loads - # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track dow. For details, see - # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; }; } diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch new file mode 100644 index 00000000000..a6fe3413fd2 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch @@ -0,0 +1,25 @@ +From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001 +From: joachim schiele +Date: Thu, 24 Nov 2016 22:25:48 +0100 +Subject: [PATCH 2/2] asdf + +--- + src/tools/tidy/src/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs +index cabaee5..685df94 100644 +--- a/src/tools/tidy/src/main.rs ++++ b/src/tools/tidy/src/main.rs +@@ -48,7 +48,7 @@ fn main() { + errors::check(&path, &mut bad); + cargo::check(&path, &mut bad); + features::check(&path, &mut bad); +- cargo_lock::check(&path, &mut bad); ++ //cargo_lock::check(&path, &mut bad); + pal::check(&path, &mut bad); + + if bad { +-- +2.10.0 + diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch new file mode 100644 index 00000000000..c89d22dcb1e --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch @@ -0,0 +1,25 @@ +From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001 +From: joachim schiele +Date: Fri, 25 Nov 2016 02:17:02 +0100 +Subject: [PATCH] asdf + +--- + src/tools/tidy/src/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs +index cb11fe2..c9b7d2a 100644 +--- a/src/tools/tidy/src/main.rs ++++ b/src/tools/tidy/src/main.rs +@@ -45,7 +45,7 @@ fn main() { + bins::check(&path, &mut bad); + style::check(&path, &mut bad); + errors::check(&path, &mut bad); +- cargo::check(&path, &mut bad); ++ //cargo::check(&path, &mut bad); + features::check(&path, &mut bad); + pal::check(&path, &mut bad); + +-- +2.10.0 + diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch similarity index 100% rename from pkgs/development/compilers/rust/patches/disable-lockfile-check.patch rename to pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b825c113245..905ff02d000 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -91,6 +91,7 @@ doNotDisplayTwice rec { rekonqWrapper = rekonq; # added 2015-01 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; + rustUnstable = rustNightly; # added 2016-11-29 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8c427744e7..78090a8c205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5217,16 +5217,16 @@ in }; rust = rustStable; - rustcNightlyBin = lowPrio(callPackage ../development/compilers/rust/nightlyBin.nix {}); - rustcNightlyBin-2016-11-26 = rustcNightlyBin; + rustcNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {}); rustStable = callPackage ../development/compilers/rust {}; rustBeta = callPackage ../development/compilers/rust/beta.nix {}; - rustUnstable = callPackage ../development/compilers/rust/head.nix { + rustNightly = callPackage ../development/compilers/rust/nightly.nix { rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); }; cargo = rust.cargo; rustc = rust.rustc; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: From 3000ae86025843c5343bc945fe84b34120027e83 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 17:41:44 +0100 Subject: [PATCH 122/219] gitlab service: fix sidekiq queue config --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index cb8fa901bbd..1fc3a5cc869 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -428,7 +428,7 @@ in { TimeoutSec = "300"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; }; }; From 0f7f0ced81f0be4f42de7d260a75253cda585d11 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 23 Nov 2016 14:34:21 +0100 Subject: [PATCH 123/219] libuv: 1.9.1 -> 1.10.1 Taken from #20650. --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 3c47a0453de..96d66e18f7c 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -3,14 +3,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.9.1"; + version = "1.10.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1kc386gkkkymgz9diz1z4r8impcsmki5k88dsiasd6v9bfvq04cc"; + sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0"; }; buildInputs = [ automake autoconf libtool pkgconfig ] From 56366b5e668d4d5086cbadbb04c5dbc01a798581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Nov 2016 18:40:30 +0100 Subject: [PATCH 124/219] libuv: enable checks and parallel building --- pkgs/development/libraries/libuv/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 96d66e18f7c..db77a6fefc3 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0"; }; + # these checks are probably network-dependent + postPatch = lib.optionalString doCheck '' + sed '/getnameinfo_basic/d' -i test/test-list.h + ''; + buildInputs = [ automake autoconf libtool pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; @@ -20,6 +25,10 @@ stdenv.mkDerivation rec { LIBTOOLIZE=libtoolize ./autogen.sh ''; + enableParallelBuilding = true; + + doCheck = true; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = https://github.com/libuv/libuv; From f0d7e808b28282a9cd4b8eaffd02418dae8b1779 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Nov 2016 18:11:54 +0000 Subject: [PATCH 125/219] camlp5: 6.16 -> 6.17 --- pkgs/development/tools/ocaml/camlp5/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 3e37de9bd10..12148625a05 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, transitional ? false}: +{ stdenv, fetchzip, ocaml, transitional ? false }: let metafile = ./META; @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.16"; + name = "camlp5${if transitional then "_transitional" else ""}-6.17"; - src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; - sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; + src = fetchzip { + url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz; + sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c"; }; buildInputs = [ ocaml ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; - homepage = http://pauillac.inria.fr/~ddr/camlp5/; + homepage = https://camlp5.github.io/; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ From 431c5649930ec48260204cd3afca9c03e75f6ff7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Nov 2016 18:30:15 +0000 Subject: [PATCH 126/219] hol_light: fix build with Camlp5-6.17 --- pkgs/applications/science/logic/hol_light/Makefile.patch | 4 ++-- pkgs/applications/science/logic/hol_light/default.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch index b572001a75d..5c1ec4f7aaf 100644 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -6,8 +6,8 @@ Index: Makefile then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.16" ; \ +- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \ ++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \ then cp pa_j_3.1x_6.11.ml pa_j.ml; \ else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index bc391c47b8b..fbd732595e6 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { buildInputs = [ ocaml camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light From 18a3225dace3cde74d60dc0b8840c07a2ded511a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Nov 2016 17:40:17 -0500 Subject: [PATCH 127/219] linux: 3.12.67 -> 3.12.68 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index afdc8b82fbd..72fbe15b02d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.67"; + version = "3.12.68"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18laiqnqfabrqc6dw2pkimcg30hs865kgaflflav6zz9lb3ls1d5"; + sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14"; }; kernelPatches = args.kernelPatches; From f1a0cadaec82ed63559727c8b6ceb8e33f4b4f6b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Nov 2016 18:37:24 -0500 Subject: [PATCH 128/219] git: 2.10.2 -> 2.11.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index cd737cdf4e6..c77c746c88f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.2"; + version = "2.11.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; + sha256 = "02zx368id8rys0bh2sjrxz0ln2l2wm5nf1vhp1rj72clsilqszky"; }; hardeningDisable = [ "format" ]; From ac51528df83401ff357d08ee69d31b5a6d421279 Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 30 Nov 2016 01:44:28 +0200 Subject: [PATCH 129/219] shadow: fix collision with coreutils (man groups.1.gz) The `groups.1.gz` collides with one from coreutils. The code to fix this was already present in expression, but wrongly assumes that share/man/man1 directory will be copied to `man` output after `installPhase`. It turned out, that man directory is set at configure step, so we should remove file from `man` output. --- pkgs/os-specific/linux/shadow/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e56f285d526..e99d7d86bfb 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { postInstall = '' # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups $out/share/man/man1/groups.* + rm $out/bin/groups + rm $man/share/man/man1/groups.* # Move the su binary into the su package mkdir -p $su/bin From 5c0367ee5b80bb7322cfc696a43d0eabd0506f9c Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 30 Nov 2016 03:38:11 +0200 Subject: [PATCH 130/219] urxvt: add vtwheel extension This allows to scroll content in less, screen, nano, tmux and others (the ones, who create so called "secondary screens"), similar to VTE-based terminals. Note, however, that mouse wheel won't work in `less -X`, which is used by basic `journalctl`. Fix it with `export SYSTEMD_LESS=FRSMK` --- .../rxvt_unicode-plugins/urxvt-vtwheel.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix new file mode 100644 index 00000000000..000828ddb7f --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation { + + name = "rxvt_unicode-vtwheel-0.3.2"; + + src = fetchgit { + url = "https://aur.archlinux.org/urxvt-vtwheel.git"; + rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; + sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; + }; + + installPhase = '' + sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel + mkdir -p $out/lib/urxvt/perl + cp vtwheel $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; + homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; + license = licenses.mit; + maintainers = with maintainers; [ danbst ]; + platforms = with platforms; unix; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e68..27088e83dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14475,6 +14475,7 @@ in urxvt_tabbedex urxvt_font_size urxvt_theme_switch + urxvt_vtwheel ]; }; @@ -14484,6 +14485,7 @@ in urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; + urxvt_vtwheel = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix { }; uade123 = callPackage ../applications/audio/uade123 {}; From 0028abeb4ed1432b99c0b977825c577b3baff3d1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 30 Nov 2016 06:00:52 +0100 Subject: [PATCH 131/219] libffcall: 2009-05-27 -> 1.10 Use the release tarball provided by the clisp maintainer. Tested build by nix-build -A clisp -A clisp_2_44_1 -A gtk-server; only clisp run-tested. Of particular note is that the .so files no longer have executable stacks. This also avoids executable stack in clisp lisp.run Before: $ readelf -lW $(nix-build -A clisp)/lib/clisp-2.49/base/lisp.run|grep GNU_STACK GNU_STACK [...] RWE 0x10 After: $ readelf -lW $(nix-build -A clisp)/lib/clisp-2.49/base/lisp.run|grep GNU_STACK GNU_STACK [...] RW 0x10 --- .../libraries/libffcall/default.nix | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 530b04e8b42..47814ef2f25 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchcvs }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libffcall-${version}"; - version = "2009-05-27"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall"; - module = "ffcall"; - date = version; - sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i"; + version = "1.10"; + + src = fetchurl { + urls = [ + # Europe + "http://www.haible.de/bruno/gnu/ffcall-${version}.tar.gz" + # USA + "ftp://ftp.santafe.edu/pub/gnu/ffcall-${version}.tar.gz" + ]; + sha256 = "0gcqljx4f8wrq59y13zzigwzaxdrz3jf9cbzcd8h0b2br27mn6vg"; }; - configurePhase = '' - for i in ./configure */configure; do - cwd="$PWD" - cd "$(dirname "$i")"; - ( test -f Makefile && make distclean ) || true - ./configure --prefix=$out - cd "$cwd" - done - ''; + NIX_CFLAGS_COMPILE = "-Wa,--noexecstack"; + + configureFlags = [ + "--enable-shared" + "--disable-static" + ]; meta = { description = "Foreign function call library"; + homepage = http://www.haible.de/bruno/packages-ffcall.html; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; From cb74fd75d700228b441b87a6dc46fba663821a97 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 29 Nov 2016 23:58:21 -0500 Subject: [PATCH 132/219] login test: Create and use direct reads of the TTY contents. --- nixos/lib/test-driver/Machine.pm | 25 +++++++++++++++++++++++++ nixos/tests/login.nix | 5 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 1a243918c22..274b16164db 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -504,6 +504,31 @@ sub screenshot { }, { image => $name } ); } +# Get the text of TTY +sub getTTYText { + my ($self, $tty) = @_; + + my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}"); + return $out; +} + +# Wait until TTY's text matches a particular regular expression +sub waitUntilTTYMatches { + my ($self, $tty, $regexp) = @_; + + $self->nest("waiting for $regexp to appear on tty $tty", sub { + retry sub { + return 1 if $self->getTTYText($tty) =~ /$regexp/; + } + }); +} + +# Debugging: Dump the contents of the TTY +sub dumpTTYContents { + my ($self, $tty) = @_; + + $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat"); +} # Take a screenshot and return the result as text using optical character # recognition. diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index e793d89567b..a6a460fb0a7 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -33,10 +33,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: # Log in as alice on a virtual console. subtest "virtual console login", sub { - $machine->sleep(2); # urgh: wait for username prompt + $machine->waitUntilTTYMatches(2, "login: "); $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(2, "login: alice"); $machine->waitUntilSucceeds("pgrep login"); - $machine->sleep(2); # urgh: wait for `Password:' + $machine->waitUntilTTYMatches(2, "Password: "); $machine->sendChars("foobar\n"); $machine->waitUntilSucceeds("pgrep -u alice bash"); $machine->sendChars("touch done\n"); From fb9f9926cdbb2c6e66dcf28aa105d483d2bce0ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Nov 2016 09:46:44 +0100 Subject: [PATCH 133/219] ghc-8.0.2: drop use of the obsolete response file patch Our gcc wrapper has been fixed to deal with those files properly. --- pkgs/development/compilers/ghc/8.0.2.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 9ff94f204eb..6407c9b56dd 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { }; patches = [ - ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 - # Already applied? # ./relocation.patch # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 From 2605149d158a0247a344b7f484071a677d71bc82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Nov 2016 09:47:37 +0100 Subject: [PATCH 134/219] ghc-8.0.2: cosmetic --- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 6407c9b56dd..5a435508435 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -9,7 +9,7 @@ let downloadToTemp = true; postFetch = '' ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; + ''; # fix syntax highlighting: */ }); in stdenv.mkDerivation rec { From 07dcc4f43aeb3703cf55002dc00af89cc3585a69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Nov 2016 10:03:57 +0100 Subject: [PATCH 135/219] pythonPackages.Theano: move and rename variants We have two derivations, one that supports Cuda, and one that does not. The names, TheanoWithCuda and TheanoWithoutCuda, now reflect that. Furthermore, a boolean passthru.cudaSupport was added. In the future the two derivations should be merged in one, with a parameter `cudaSupport`. --- .../theano-with-cuda}/default.nix | 4 +- .../Theano/theano-without-cuda/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 ++------------ 3 files changed, 49 insertions(+), 31 deletions(-) rename pkgs/development/python-modules/{theano/cuda => Theano/theano-with-cuda}/default.nix (96%) create mode 100644 pkgs/development/python-modules/Theano/theano-without-cuda/default.nix diff --git a/pkgs/development/python-modules/theano/cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix similarity index 96% rename from pkgs/development/python-modules/theano/cuda/default.nix rename to pkgs/development/python-modules/Theano/theano-with-cuda/default.nix index bf49d391861..c9ea79bef9a 100644 --- a/pkgs/development/python-modules/theano/cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchFromGitHub -, blas , numpy , six , scipy @@ -45,7 +44,7 @@ buildPythonPackage rec { dontStrip = true; propagatedBuildInputs = [ - blas + numpy.blas numpy six scipy @@ -59,4 +58,5 @@ buildPythonPackage rec { libgpuarray ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); + passthru.cudaSupport = true; } diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix new file mode 100644 index 00000000000..6efa945b0e6 --- /dev/null +++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, isPyPy +, pythonOlder +, isPy3k +, nose +, numpy +, pydot_ng +, scipy +, six +}: + +buildPythonPackage rec { + name = "Theano-0.8.2"; + + disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + + src = fetchurl { + url = "mirror://pypi/T/Theano/${name}.tar.gz"; + sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; + }; + + #preCheck = '' + # mkdir -p check-phase + # export HOME=$(pwd)/check-phase + #''; + doCheck = false; + # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" + # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, + # the fix for which hasn't been merged yet. + + # keep Nose around since running the tests by hand is possible from Python or bash + propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ]; + + meta = { + homepage = http://deeplearning.net/software/theano/; + description = "A Python library for large-scale array computation"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.bcdarwin ]; + }; + + passthru.cudaSupport = false; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1831b2ce09..8854e227c3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23350,37 +23350,11 @@ in { }; }; - Theano = buildPythonPackage rec { - name = "Theano-0.8.2"; + Theano = self.TheanoWithoutCuda; - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + TheanoWithoutCuda = callPackage ../development/python-modules/Theano/theano-without-cuda { }; - src = pkgs.fetchurl { - url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; - }; - - #preCheck = '' - # mkdir -p check-phase - # export HOME=$(pwd)/check-phase - #''; - doCheck = false; - # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" - # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, - # the fix for which hasn't been merged yet. - - # keep Nose around since running the tests by hand is possible from Python or bash - propagatedBuildInputs = [ stdenv ] ++ (with self; [ nose numpy numpy.blas pydot_ng scipy six ]); - - meta = { - homepage = http://deeplearning.net/software/theano/; - description = "A Python library for large-scale array computation"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ maintainers.bcdarwin ]; - }; - }; - - Theano-cuda = callPackage ../development/python-modules/theano/cuda ( + TheanoWithCuda = callPackage ../development/python-modules/Theano/theano-with-cuda ( let boost = pkgs.boost159.override { inherit (self) python numpy scipy; From 705bdce17ecfd5dcc0e66f4b942e3841cda7fbf1 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Wed, 30 Nov 2016 11:02:46 +0100 Subject: [PATCH 136/219] hexRegistrySnapshot: d58a937 -> e5e494a --- pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index 9f5cc3a63e6..f283b429b96 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "hex-registry"; - rev = "d58a937"; + rev = "e5e494a"; version = "0.0.0+build.${rev}"; src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex-pm-registry-snapshots"; inherit rev; - sha256 = "11ymmn75qjlhzf7aaza708gq0hqg55dzd3q13npgq43wg90rgpxy"; + sha256 = "0877dragfxs22a05d8mv42z5535kfx9rs4y7fwwbd1ybphczf8za"; }; installPhase = '' From 10cf3b150ee4e6eacbb6592dab3406820cb19fe9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 30 Nov 2016 13:04:48 +0100 Subject: [PATCH 137/219] haskellPackages.HDBC-odbc: remove haddock fix again --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0498bcb2777..4b3a16de26d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,15 +1068,6 @@ self: super: { # https://github.com/roelvandijk/terminal-progress-bar/issues/13 terminal-progress-bar = doJailbreak super.terminal-progress-bar; - # https://github.com/hdbc/hdbc-odbc/pull/29 - HDBC-odbc = overrideCabal super.HDBC-odbc (old: { - postPatch = old.postPatch or "" + '' - sed -e '/data BoundValue =/ { s/$/{/ ; n; n ; s/{ bvVal/ bvVal/ }' \ - -e 's/-- | This is rather/-- This is rather/' \ - -i Database/HDBC/ODBC/Statement.hsc - ''; - }); - # https://github.com/vshabanov/HsOpenSSL/issues/11 HsOpenSSL = doJailbreak super.HsOpenSSL; From de4dba37a1b2947494d51291a38155208e838b42 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 30 Nov 2016 13:11:36 +0100 Subject: [PATCH 138/219] pythonPackages.pytest_30: 3.0.3 -> 3.0.4 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92f8b301b9e..e558c7d43ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4866,12 +4866,12 @@ in { }; pytest_30 = self.pytest_27.override rec { - name = "pytest-3.0.3"; + name = "pytest-3.0.4"; propagatedBuildInputs = with self; [ hypothesis py ]; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1rxydacrdb8s312l3bn0ybrqsjp13abzyim1x21s80386l5504zj"; + sha256 = "03d49xc0l4sdncq47rn1p42ywjnxqrvpc160y8dwvanv3wnfx7w7"; }; }; From 58faa138d404f231cc6004f95d13a9001cf51923 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 30 Nov 2016 14:17:36 +0200 Subject: [PATCH 139/219] syncthing: 0.14.12 -> 0.14.13 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index d46120e0088..ee4bb586d55 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: stdenv.mkDerivation rec { - version = "0.14.12"; + version = "0.14.13"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "09w0i9rmdi9fjsphib2x6gs6yn5d1a41nh1pm4k9ks31am9zdwsm"; + sha256 = "0gq218f1rhzjrqh2gjyvqksa7a1agwhm8rfqf5jw58pncblrn6v4"; }; buildInputs = [ go ]; From a9611a52f3f01f0366cb7c08fab45c09a64e19b7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:23:42 -0500 Subject: [PATCH 140/219] mcabber: 1.0.3 -> 1.0.4 for 'roster push attack' --- .../networking/instant-messengers/mcabber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 3ae3f7bb3dd..ca752ccf826 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4"; + sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; doCheck = true; - + meta = with stdenv.lib; { homepage = http://mcabber.com/; description = "Small Jabber console client"; From 0707962235faaf499c47c0d24e1fec53399c4f7b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:29:44 -0500 Subject: [PATCH 141/219] mujs: 2016-09-21 -> 2016-11-30 for multiple CVEs - CVE-2016-7504 - CVE-2016-7505 - CVE-2016-7506 - CVE-2016-9017 - CVE-2016-9108 - CVE-2016-9109 - CVE-2016-9294 See more information: https://lwn.net/Vulnerabilities/707361/ --- pkgs/development/interpreters/mujs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index b8359488725..0a87d037454 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, clang }: stdenv.mkDerivation rec { - name = "mujs-2016-09-21"; + name = "mujs-2016-11-30"; src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a"; - sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw"; + rev = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89"; + sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg"; }; buildInputs = [ clang ]; From 7d09138caec41f53fa34dce47c56436283dd9a40 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:37:48 -0500 Subject: [PATCH 142/219] perlPackages.DBDmysql: 4.033 -> 4.039 --- pkgs/development/perl-modules/DBD-mysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 14ed14e34af..0e1db7e234d 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, DBI, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.033"; + name = "DBD-mysql-4.039"; src = fetchurl { url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"; + sha256 = "0k4p3bjdbmxm2amb0qiiwmn8v83zrjkz5qp84xdjrg8k5v9aj0hn"; }; buildInputs = [ mysql.lib ] ; From 0cff959e790c5ee6612cbba44d709aa3e71f6c16 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 09:07:17 -0500 Subject: [PATCH 143/219] maatkit: update URL --- pkgs/development/perl-modules/maatkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index e301bd1009f..fabb3824129 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -4,7 +4,7 @@ buildPerlPackage rec { name = "maatkit-7540"; src = fetchurl { - url = "http://maatkit.googlecode.com/files/${name}.tar.gz" ; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz"; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; }; From e3a873479eee4e19a852011d45b0fb653f6c9e89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Nov 2016 15:14:30 +0100 Subject: [PATCH 144/219] Remove fetchMD5warn Deprecation warnings should not be used in Nixpkgs because they spam innocent "nix-env -qa" users with (in this case) dozens of messages that they can't do anything about. This also reverts commit 2ca883338389b7ab995924a0cab0211993bdf1da. --- lib/trivial.nix | 3 --- pkgs/build-support/fetchdarcs/default.nix | 3 +-- pkgs/build-support/fetchegg/default.nix | 3 +-- pkgs/build-support/fetchgit/default.nix | 3 +-- pkgs/build-support/fetchhg/default.nix | 3 +-- pkgs/build-support/fetchsvn/default.nix | 3 +-- pkgs/build-support/fetchsvnssh/default.nix | 3 +-- pkgs/build-support/fetchurl/default.nix | 3 +-- pkgs/top-level/make-tarball.nix | 5 +---- 9 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index 39cbd67fba3..7860b949939 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -138,7 +138,4 @@ rec { */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; - - fetchMD5warn = name: context : data : info - "Deprecated use of MD5 hash in ${name} to fetch ${context}" data; } diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index ecec51590b9..3c2e0524eea 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -7,8 +7,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchdarcs" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev context; } diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index e82d4d95ac2..3e0d5d566ad 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchegg" name md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit version; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 982229cf8a5..e40b460d390 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -50,8 +50,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchgit" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev leaveDotGit fetchSubmodules deepClone branchName; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index b30a3556b0f..79f610166a7 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation { outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if md5 != null then - (stdenv.lib.fetchMD5warn "fetchhg" url md5) else sha256; + outputHash = if md5 != null then md5 else sha256; inherit url rev; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index b6f68e21384..85ec52c4bde 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchsvn" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev sshSupport openssh ignoreExternals; diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index 2d151fad07c..6c6c03d6873 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchsvnssh" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; sshSubversion = ./sshsubversion.exp; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 2cc45ca4bbf..00f485ce697 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -112,8 +112,7 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else - (stdenv.lib.fetchMD5warn "fetchurl" (builtins.head urls_) md5); + if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 8b3b67f4b05..2fe69390ec5 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -63,15 +63,12 @@ releaseTools.sourceTarball rec { fi # Check that all-packages.nix evaluates on a number of platforms without any warnings. - # Filter out MD5 warnings for now for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | - (grep -v '^trace: INFO: Deprecated use of MD5 hash in fetch' || true) | - tee eval-warnings.log + -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" From c0da5f78d646b31d17a4b6f611fb77cdeed5ab7c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Nov 2016 15:21:30 +0100 Subject: [PATCH 145/219] make-tarball.nix: Don't check broken packages They're broken after all. In particular, this prevents us from evaluating packages that are unsupported on a particular platform. Reverts a147ddc42ce96608aa424f7b8b8784bd938958c7. Fixes #20817. --- pkgs/top-level/make-tarball.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 2fe69390ec5..88f02715796 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -66,7 +66,7 @@ releaseTools.sourceTarball rec { for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" - NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ + nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log @@ -76,7 +76,7 @@ releaseTools.sourceTarball rec { fi rm eval-warnings.log - NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ + nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest From 18757f3a11e93e65d4ac6432103f7c27466ee8b3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2016 22:59:50 -0200 Subject: [PATCH 146/219] XFCE plugins: update, taken from #20410 xfce4-embed-plugin : 1.4.1 -> 1.6.0 xfce4-eyes-plugin : 4.4.3 -> 4.4.4 xfce4-fsguard-plugin : 1.0.1 -> 1.0.2 xfce4-verve-plugin : 1.0.1 -> 1.1.0 xfce4-xkb-plugin : 0.5.6 -> 0.7.1 --- pkgs/desktops/xfce/default.nix | 4 ---- .../xfce/panel-plugins/xfce4-embed-plugin.nix | 6 +++--- .../xfce/panel-plugins/xfce4-eyes-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-fsguard-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-verve-plugin.nix | 6 +++--- .../desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix | 12 ++++++------ 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 991ed0eb6be..609ed57ab3c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -100,7 +100,3 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od }; # xfce_self in xfce_self - - - - diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 0acf503abe7..d7c5f53d2ee 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-embed-plugin"; - ver_maj = "1.4"; - ver_min = "1"; + ver_maj = "1.6"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0s0zlg7nvjaqvma4l8bhxk171yjrpncsz6v0ff1cxl3z6ya6hbxq"; + sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 29b23767eb0..6e0f98156f0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-eyes-plugin"; ver_maj = "4.4"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z4161i14m73i515ymhj34c1ycz5fmjmbczdd8plx3nvrxdk76jb"; + sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 539f1332004..3e3861b7604 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-fsguard-plugin"; ver_maj = "1.0"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1dxa6gpw4a07ixccafd9fnk38r4fax4bhll73fchpv39jzh7xyzz"; + sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 44269070609..334d6f4943f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; - ver_maj = "1.0"; - ver_min = "1"; + ver_maj = "1.1"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; + sha256 = "114wkmgjxkim1jkswih20zg9d7rbzmlf30b5rlcpvmbsij0ny6d3"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index b9bd520f001..42c54bf46b3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel -, gtk, libxklavier, librsvg, libwnck +, garcon, gtk, libxklavier, librsvg, libwnck }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-xkb-plugin"; - ver_maj = "0.5"; - ver_min = "6"; + ver_maj = "0.7"; + ver_min = "1"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "198q6flrajbscwwywqq8yv6hdcwifahhj9i526vyfz4q6cq65r09"; + sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk - libxklavier librsvg libwnck ]; + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel garcon + gtk libxklavier librsvg libwnck ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; From fa4212e76340ca2d8b855a00d33aa90c15df7b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Nov 2016 21:05:01 +0100 Subject: [PATCH 147/219] cheat: 2.1.26 -> 2.1.27 --- pkgs/applications/misc/cheat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 09bc8f25b26..246a50842c6 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,15 +1,17 @@ { python3Packages, fetchurl, lib }: python3Packages.buildPythonApplication rec { - version = "2.1.26"; + version = "2.1.27"; name = "cheat-${version}"; propagatedBuildInputs = with python3Packages; [ docopt pygments ]; src = fetchurl { url = "mirror://pypi/c/cheat/${name}.tar.gz"; - sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm"; + sha256 = "1mrrfwd4ivas0alfkhjryxxzf24a4ngk8c6n2zlfb8ziwf7czcqd"; }; + # no tests available + doCheck = false; meta = { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; From 3675631f63901635d94aa6dab984d606653ec0ae Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 30 Nov 2016 23:28:18 +0100 Subject: [PATCH 148/219] convoy: init at 0.5.0 --- pkgs/tools/filesystems/convoy/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/convoy/default.nix diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix new file mode 100644 index 00000000000..fe713556577 --- /dev/null +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -0,0 +1,26 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: + +buildGoPackage rec { + name = "convoy-${version}"; + version = "0.5.0"; + + goPackagePath = "github.com/rancher/convoy"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "rancher"; + repo = "convoy"; + sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; + }; + + buildInputs = [devicemapper]; + + meta = with stdenv.lib; { + homepage = https://github.com/rancher/convoy; + description = "A Docker volume plugin, managing persistent container volumes."; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c3..6250a77f267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,6 +1278,8 @@ in convmv = callPackage ../tools/misc/convmv { }; + convoy = callPackage ../tools/filesystems/convoy { }; + cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { From 288e75c5f9c45062f7401f40d11b0c04199eca4c Mon Sep 17 00:00:00 2001 From: lbonn Date: Wed, 30 Nov 2016 23:54:14 +0100 Subject: [PATCH 149/219] wireguard: remove dependency on ip-up.target It was deprecated and removed from all modules in the tree by #18319. The wireguard module PR (#17933) was still in the review at the time and the deprecated usage managed to slip inside. --- nixos/modules/services/networking/wireguard.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 35918e42b40..52dd5502147 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -151,7 +151,8 @@ let nameValuePair "wireguard-${name}" { description = "WireGuard Tunnel - ${name}"; - wantedBy = [ "ip-up.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From eba91fa2bdc130da4ca35a2f60b9d30d90d284f9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:20:21 -0500 Subject: [PATCH 150/219] tomcat6: 6.0.45 -> 6.0.48 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 00aaff899dc..66613335166 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -33,8 +33,8 @@ in { tomcat6 = common { versionMajor = "6"; - versionMinor = "0.45"; - sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg"; + versionMinor = "0.48"; + sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; }; tomcat7 = common { From 3d0310daf383efb0357e483a082cafcf43d45ae1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:01 -0500 Subject: [PATCH 151/219] tomcat7: 7.0.72 -> 7.0.73 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 66613335166..5c22278cf62 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -39,8 +39,8 @@ in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.72"; - sha256 = "1nx5pmz3bq3n20fdspqh8ljqy1nj67rwi1vsqjpkrvd996x7p73p"; + versionMinor = "0.73"; + sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f"; }; tomcat8 = common { From 80a475042c4be3bb564a4a2d609a9f66ae906574 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:16 -0500 Subject: [PATCH 152/219] tomcat8: 8.0.37 -> 8.0.39 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 5c22278cf62..e22f2761231 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -45,8 +45,8 @@ in { tomcat8 = common { versionMajor = "8"; - versionMinor = "0.37"; - sha256 = "0f9d4yxjzwdrayj5l3jyiclnmpb5lffvmsnp54qpf6m3gm7cj5i6"; + versionMinor = "0.39"; + sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0"; }; tomcat85 = common { From 42f1ae1911421e5fa886432aae38a52a6b343490 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:27 -0500 Subject: [PATCH 153/219] tomcat85: 8.5.5 -> 8.5.8 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index e22f2761231..7d972ba3486 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -51,8 +51,8 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.5"; - sha256 = "0idfxjrw5q45f531gyjnv6xjkbj9nhy2v1w4z7558z96230a0fqj"; + versionMinor = "5.8"; + sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0"; }; tomcatUnstable = common { From 5f789809736002bd973f9e98685366249222de58 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:39 -0500 Subject: [PATCH 154/219] tomcatUnstable: 9.0.0.M10 -> 9.0.0.M13 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 7d972ba3486..edf1e59931e 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -57,8 +57,8 @@ in { tomcatUnstable = common { versionMajor = "9"; - versionMinor = "0.0.M10"; - sha256 = "0p3pqwz9zjvr9w73divsyaa53mbazf0icxfs06wvgxsvkbgj5gq9"; + versionMinor = "0.0.M13"; + sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91"; }; } From 9c71508c95482139f3fb1fef2cc5f3cb20600ad5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:34:35 -0500 Subject: [PATCH 155/219] bzip2: patch for CVE-2016-3189 --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ++++++++++++ pkgs/tools/compression/bzip2/default.nix | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch new file mode 100644 index 00000000000..eff324b3250 --- /dev/null +++ b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch @@ -0,0 +1,12 @@ +diff --git a/bzip2recover.c b/bzip2recover.c +index f9de049..252c1b7 100644 +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index cabd412fe65..51f47811065 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,10 +20,16 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; + patches = [ + ./CVE-2016-3189.patch + ]; + + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From 892a9b1f0faf9553234784f5569a883c6f4f34ce Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:05:52 -0500 Subject: [PATCH 156/219] icu: patch for multiple CVEs - CVE-2014-6585 - CVE-2015-4760 - CVE-2016-0494 - CVE-2016-6293 - CVE-2016-7415 --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index cd4398b3cc0..a2465ce930f 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,4 +9,3 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ba8fe038ffa..d4a4c2a500c 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,6 +25,38 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; + # This pre/postPatch shenanigans is to handle that the patches expect + # to be outside of `source`. + prePatch = '' + pushd .. + ''; + postPatch = '' + popd + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; + sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; + sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; + sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; + sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; + sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; + }) + ]; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From 6393ca650eb9ef5f045905600c4256a0d0bf20b7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:06:43 -0500 Subject: [PATCH 157/219] Revert "bzip2: patch for CVE-2016-3189" This reverts commit 9c71508c95482139f3fb1fef2cc5f3cb20600ad5. --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ------------ pkgs/tools/compression/bzip2/default.nix | 8 +------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch deleted file mode 100644 index eff324b3250..00000000000 --- a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..252c1b7 100644 ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 51f47811065..cabd412fe65 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,16 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; - patches = [ - ./CVE-2016-3189.patch - ]; - - postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; - outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From 097a8ee174ab006a9b6de1065b140177aed163ae Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Dec 2016 09:05:00 +0900 Subject: [PATCH 158/219] firefox-bin: 50.0.1 -> 50.0.2 Critical security fix https://www.mozilla.org/en-US/firefox/50.0.2/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2016-92/ --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index cee9f16390b..cb85d83065f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "50.0.1"; + version = "50.0.2"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "79fca7e28b71bcf665021ebd54bf8acb80d6d598a2abd6235d455dd64085ebb4b26ec14341a3139a70ddd96f8e5861b7f2685cd1f5cb909af0f12d21d1bffc11"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "07af694903d677e11d6266d251bb7aad31e0c21e0bc7af67cb4888af20c38aa02c001799b93836553a9699d038ae896337d75ba4dacd47aba02b979097a4863c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "ed0afc72579b59cd59be409dd35d18becd8eb7a8bbaf4fb1de451cc29cf8464a528f4bd78fd914f1951ac9b9f45ec8f12291f1487ed9c5f0dbcf4a2fdb821c82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "18d387115da72dc1312864cb67f0ba40e94546bfe1cd4530ae97c5f58443508fd0bd94e91a9f2e6bcc528b115449ae2abc53f6c318cbfc0d1db5415f80ef8ada"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "deb7a2e2cebb721e90d19820b4489ad64f90603dc7d88596083c7bea9cca7910e2d17d502329fa1a427d08d5ba6dacbd34a1e7855ff7a48933fde61d2650ff0d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "c9cfc8237a0415ee375a2a8dd08f83ac039fad866da05a55cb2adc2a3bfcfc2293f9059139588e93ee25568c5099d80a9dc56321e7dae92bcd0b076d7d1a8062"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "ce2418f967e8ea03acfc2c8b47dd4460127865917134f555e44c834ec4eb5cc1bcce6fbfedaffdfcc372fd40d757693fea5dad570730b3fe1e69e8ebea732d8c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "cfc8ab9c94df5c60881b48ec32807128597c528fb22ccd08afaa643a232f6e793ea04263e445ba468099e58a7f81bf5721b839ea6adf75f201521bbd59ae0fa1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "41057a92d38896a11eecabab4d85cc08765764f0f33581d604fa4e76ddd1600030033309cefe62c1e8d43b45ca1a25a079c522d54329b6aaf59b7a17c76b6991"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1feb97f7553d4aa4ab914806bbdaa16bfbcf192b002f4875f8796389a7f9b892c4dbf4f04fb52f17d062d9e555831d6eb31ed32714f0bd45d3e629aa65f0abaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2d5ba2c2682276eb58c92c7a45e4c6e8341dcbda1eb01214b4e912ba7aba084357e35e35a03e51e51d246f72d25293482ad60dfc6bcbef1710b1df10b1f63893"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "0ffef374f47f8525d02e578e5cceee5821ed1319368e3cb9c78e8037f4089e3113db156bd77437c7c41af8dc57538d27484fc405791f39f0a431b72cb199b7c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "c95091418cceeca6f5d84e65200566bef4b1b316f78177cacd2191ce9c6637cea5bc53a2f44f318edb04bd1e08a2976afd8d8e523ff65e471f71576a62c10207"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "ee8557e2a39f6f04d6269ff6dc09fb17ffe383b9441c499b626f8c0ede6e0984b9c338e30d356d13b1a7d226c72b949a0a868d6baf542726a972e1655b3de868"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "0617722ffb61b7a732a1d2b448ff5f513effcab4ec2eaf1d97ebbeb69ed8cd693f20137d4e1d83e128bb7cfeeacb98b4c149a0a51935010f00b3e554d00d740f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "2fe7086dbbc7886a0bbb2b75f493c3c4d45497f1de9625e2a64c4cc506d8f73e42000d3ba3d81e39861817e7545f9b29ea3a41f27440d1587c0a4f04a99e5f84"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "ecf746ac12b5508d143e98252a121d246f00776daac2d1c972978a37701ddd2132d562ab328bbc2cc4cdc74e02232ff70efaa8ba5ad50769994d1b393eabb8db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "7e04449f5e3934e73357622c9d1819cb84111a963ddb59b06e1b266d6f56afa78cbb88da7a41fedb7ab695149900fac70e5b379171accabd6c903dc211d2eff2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "75198737ab142988f034ea78a3e289992107da83b115ad671487320a0fb6af4f3aab1589676542725d25e9b0f43ec30da41bc95c63597228337d25ff73baa8cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "c1096bae08cad67205dab2b81d25b8cfe835eb3a2657701d6f89fa978f92d5c45b5a3e9dfe90f3cf78158f5fc68922da4c235d57dd837d4b00933207265ddc23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a0fe8351efd9ebf9c3441a831a50aa1d5eb413b5d9f1a7f57e068a25c00c2efc062c71bfe47501ca5016138fb22762a3a37dd90e50113bb038fd1566adc36fc6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2cfcfa36468f16c7f3b32d98ecb51c432a8ccb19a91cfa8e99974b21a60851c1b73aa4e9261b10cc9ea0bdc4c862c9db6dc9cacd46d2070abaf991812e680d45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "9c6acb0013921bd51ba7caf4016a75ee6f02e7388cca676fad6ef7e330f984ef28667da14a777740f9d7d03659fd74c0621a2ecb2b447106998362815dd74fbb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "828599a94a461ebed9fce77e0968741cfc0e79375cc9bc0584d1fabfa11fd7a5300406298ddd0b9650548c18db5873376cef155807b62a110ede500d62e2effe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "6581af0e61dc1286af63f7ff18270a7a8326679f8090f3dda07917cd3bce0febbce45b30e8d819231fd91e1d15eed394525d24afe79fbc8841148e85f332940a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "89d0c07943c2c7ec8052289afdedb9483ed5752a5967795938d12fb87b8ab80248058f2162e84a9bf526d1165b4f7d651f39e7dd9eda9b4455565f8f48f1a4e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "b879086f33d86da437d4839c6c3443b8b4bb524ea1645b460a8f7a90c2d3e3aeab540daad501b7ba2c9960eb625e74ece8cbbffc39e6931e0421beafba0969eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "5b2a622224c0b0fd9f6e003a051bcbc25c9282e464f21c16495779f22c5f64275ee3e5c10afe31802b8badd99b7346533b7999e7e525f24f7e3a78450ffc0ac5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "961eac523fd0402c9f1b4532c00661df5391a08f3af6180007f5f59e754fa795063c188491614f2e7ff1d253fcb04b34216a95718edac035df3c62f6714c8906"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "9768209346ccb052e92e44833a5672dd032f5915106b7884f6b4c363a257010d284120ff20931f0c6f68c0f4c72b4818408bd8f723d24879932fc598aea4f06b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "b1d788775f15216273338c9f12a61712b546acd6b353681adf44d19c5349ae35d201737c69c19c0e7ef3abb8d3df36e07093523eb8af7cb81d56cadf5906d52e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "b54c884cea39defa105556302e483f4f39d96f413df8eb94e8232d0b5832ab760d2affa2ff248851fc8a060dcbeed84b9ec58b4fe2dbed963b19a497bdaf7ebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "98c249ee8a67bd48e6368033c5b7b06ea0940ee66568d6105b13ae7a3d58fac6e1135376962958a4a290bdabc43fa0a0ee8fb32429e3c2c7e5dd0296ba0f55ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "1fe74bfa41d59ef31384ee5f819ec284d1dde33f62da767699f0decff49a1f00a4fe44860546aa20a404a743420c5bcc20b7a67ae9bb7c01b072f113edc90ac0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "444287facf993cf321dd477d366498beb4a834ef6977b71a6e328566a16c6a17aa3d5f67b5bae26cd4476b85e1271f72b9223939db528b2998d21bf5237a9d05"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "c087db44747af90822881d7e466f8246df0d5bce957aa93ff9c27da16cab195f29121cc67d1de9099c3e018c6ff2a6f22435b2c1ea3a5e99bb8592dc0a8bb0d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "9d8ee1ae3b1a8072b9ffc7162707ab8b5881d96970c72ff5d27dd78f37527f163ee30feb64121e9b7eba6ba0002ac7a6ba511364770f2c9759781cd6435d8d06"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "83f05cf00a86f26c414b11227c3a893608a218cfbfde29b67ec7d10fbadaad95dd59402557d1a58dc15a4cd50e27f8c15ad067b9cd3387f5e1080c280377c6d9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "1dbabac6ef0365dcced762805a25dfcc867185430dbf87a0affbe0eda4e37fb0100844b9ef7418fcea54f1950779a57afefd9fc2b8c3b9777df08134dd8b172d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "86c145eb3e031f677bd3e66e3e52442d85e02d2350b3c281094e8f72279b0edb19ec4bfae15819d4c7b483f0bdd00c324cafaed4cf924af606be1f29da19ff87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f217dd91412f709055f085e747593a1c06f71f23cf87afd04685ff4f9dc7511d2aa0ca60f6ed9e7751ce9d18dd801788a0981deb9233b6457eb294b9d3a6803d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "b15189ccbc478ac7eb57c1a3027fc4865a87490cd0ce6023110793bfa2451d64d98e6ef70d9c33e42b2fe50a042b140961b6cda1e9e44d787045bcd880fac7a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "289efe9e1046a3367ae7f379c86405808acbcd7478a10af0a785f8cbba2a0645888bf5dc180b6a3ebe300a69a0ebfc12b211b1b6901ff4343da88a0ce17b9161"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "df65892afd9e6e13e5ef6b6e94a453a6402286171f87bdbda21d51abb2d8a2900aa1cecf01cba9216ebdb8ccc60d7d40c9e6ba2710de2e170b223c18b7030708"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "e768d47528799f22c291abef82ff372f9f7a60a844f26c61e94ed39c0998f0fda4abaa3e27f520079b741c0cdcfd973e9745a5c39cba02d9de3bfe74ee06e9a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "56bc42624be4e27a086f4a38cdc1613a291a5ab22859bca25e39651b23854d596c68f7ab930026bf7a7df590bfb429538ff8bc59f6a6cf6f5249768fc1dc414f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f89f6a75878b89c0c1252c17d3baad19a4f44ed9e64880c345521be8ca643f5edc83097261f849b2b46eab3923bacc17c9f9e143a7ca98b702c53a5151e0d4e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7a518aebce8a27b9561c576054dff8e58759f56bc986a3a0626e2de7053ec69677f57b22e56ee54e6eb2ee1ed06d9ce650300731602b19f85cfb17d3c6ebc891"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "76e24f56a9072c88207221ed4f607d4f03144581301ccb8eaca66ac9d0fafc4c2ef67c446b6bf4001586de943336d854e0d950b3e5aebbc167c43422d484cbef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "76f65744d90c79393f1ab4ce35ce86f8e970c35675761bc74aad07c66e69e0a403261c502d697497c0034c4bfa1043decb9f3fc83a7aa8c386d2ebc7b6b422b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "c577bddd6b71d93772abe83c2a4b7ecc26bab5e3f53d7a8ebdf820f4694173603d969e8baded32eb5e0a750c5f8da2afa829341685c78e4f83396739dd340e8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "38e55ee251bbae1d96008742c5c6a3b4eb5150c442d6b0728849dfaf444d77fdac9c11865388fa224633668de578c66d0ae16192dc1fec7930d4cc7684369f1b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "382e026173aa82f00bc817704f2acc030ab2f939bce4f6e6ed039b1d4f917c57e35be5812ab57616097ec9e27a81c36517bd7977b777dd6bbec5f347bd985645"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dfbce27fb2bece1f32b5c10d93c48c927d2c60673240e4ae65f33c5658aabb682f3dbae0fb2c44c8465e54711ba879afdd4ec09feb04b9b4b7b9f73675eeb878"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "bf49fd10f7e70e419d2a4eac4277066121a54ed588533523412d5286613459b74086cd49b44e77266217444c851a9d78497e0ab3bf821db86038f948bec40011"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6fd53b36740c0bc2ed524b3cfdc1cf6baad630304a67543695ddd8dcf3d5e254cf5b754d188dfd93a4d27848ab99c89e1a473435dc32513bec0c7464c5f523f7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "15d08e8ab252be103741f40ec36f2a782372c29ad8ccb6af7b79557d1aba7381d4ab7186247702772777fd68c31dd0de6a78c7117f33c90f8ab58ceab8b7445a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f5f4e74d181bfee27d402b5d2123934480eff95c0240d762f7f648e4220fe3c9c154df8b849d9ea27bd4d0b53997d3175f7f3b7bc8ee70be7086d0bf676a729b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "7eb67ca81cfd0ee4a19b98cc00db084a2d29f1b335bb51ecf75a833f1133ff31345726292bb03c777a6654070685c78774c53a263fede51c4c101f6bd22249d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a91f4ae5ec30fd2447521984432ea1997796f6569e99c2763364ff6857e579f1c0631addd4fc8f0faed5f489efef6bd29d817de58dc1b432abb0698a5b0291ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "7f9318bc697e5654f0585f18fe9525c1eaf24de3e9e33c87a7d0471ec8d41552798d9149cc58f3849a0cfa5850639ec95332df861f9215061bb3eb9af78fedf0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "6a1fdf302c54afdc25e1b2e3c055044b8c37eeba5e51fab0ff3df9517f3137482f9daf28da4cd62072845e368260986e9d03593074e4b448f3aa23de5c7a3dd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "c07bf9368b8c49936dbd4f36aa01f40d10c23edddc14526177e2ea98bdf7f36e482eece3e2f3ff16f04f0078f7c993833c52014514cdad4d1c476f326fcd8482"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "0fd3b4e08cf0ce0f3d68880564f1c14bdef198f0140404ecdf4cf9c8d48cc7dff0dcda9be0b3af274878efc9ca3b764cead6430d0e348c550cd5abc23dda16ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "0395d9d46363a2f598615551aba6ed3b0419f83038c7744dc29253469a52c318c474bc564fd1560d9f5bf9375bde1a9f4013dcefcc781ebc82bfbfec6c910ec2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "3c804f341dbe6d69e2cdfdd2dc1bc294dc04c4ea3bfd4a62e4de6edbca0be00f76a3112a56c9e5b3ae0929cf01168cadf7242246fbdbe25ff74bb088714c05a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "056cb941c6ad6b9445a896d3cf948c942aa5c2f9506b80b72f1a3926e33c2f0798c6ef437152637a3a137f6b6e8d8f0eaef869788e7925282705a00d3d5ab01c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "325baae030a6b23bb4dbc8bf51a87dbc27c6349b3d56366730d2aee975aabf9f1d9af505b7fb1ea6aeab4f5891ac74166c5acbf72b503accf5614480d57c7402"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "f5c475b7c0c8d7ff4426c840189fa6b6e2a39ad64b1ba24477ed5cf164e55c4ea7065ca3785d9c56d5d35503c26bf52a00d491b3557b307f437a0744d7cd100d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "603b0bd1087e63f2d0e0ac26266cdc7e038e8faa014d80f9f0e194b2878886b466a541c8c4b79a1026ccc60cec6d0f555d6e65a7a53dacdb7cb595a7f877f6f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "4abf78014ad6eaa93c9ddfca43f24c9f4e160b8f9619ddffd57a31a30721ad8d11e7f3b4697de76b30ea6a3a07973b460febca607000a48da7e6d422548e1ef0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1614556b3b9ac0ed6be7ca4455882fe57a9644dfed95b0b3818498d4b47cde9c95fcca66d820802154721ab90ecff8e662f3670ffc6f4f5224dc35139fbc6fed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "d38810c0bb088c999079575253492df0fa57d1995c2e88c5a49ec57e858e3c550bf86a4e834037f6ab11b1d956b941557cf44d562c8214ece0175c61b6de34d1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "d498f468ed487c5dfb70cd8e831d7694665e9cdc2a9eb0fd7526e4f7c3f97873af87fd919990b03e921dabdcf35859840f263fd071ec4151f5812461c97c8179"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1f2f939987840e0e845238a4123d81c698b528474b81facb7a296d80be023aee8b3036db095709167ea3da310a9040d7bbee5d16f7c7aad6444f3c1e078b2ce2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "29954be29ffcf9dce21f53fb674d5d14f17ba04315dcb114756478e0cb4c6b58e61ec1c1fbdc7a25808a1ca347b512691481090504b1ac85e6998950edd043bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "92fcdffc99f3d7b6bd70889b3ad6bb661ea7071be6ce65461dfb1a93b4a566ab5b5f24c7cfefe6c2d6515e8f42b3d04ec01a13c2919e47daeffdb5034ebd5e36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "66adebeb4bcdac0060b8cf562607deb8956588d86a04fee35f23b753614aba9588e74e2d389055c5186099bc200fde27529a26392ba08c0aa69ccd9be12a5eb0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "4ddfe0518a1487479c0c68b53cf24f9eebdcd91cde738053cb3e796f9373a0147f980a3dd7356ab92083f2b8975379c42691e7dd9cf5d78075a86cfe5a83d8e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "3fc217727c139a11ab77218428269851df78ae42fc34e4deb34ba48733bee2af878aadc5a90578c467072ac4f328ba5db3f1588069573521e951aecae25552ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "6bd026db0390d79a142954b2c8feae4f884cacfd5f8418e31b7c6b88ec171160054424c87af81ca8701a32065e9de3d469699471a99aed498683296765d22033"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "751fc9580027ae5dbd05202578dfe059b1c849dac79975da4245c94e5fa7089a7f189fe1510341072b41fbe8e1fa5e22217a9876cd033e062fb6c567523e3326"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "1c229bf7dfec02cf035a2b6d2b17b55d24fc7ad6b36f1c2be7f08898a94c02e31e1812e1232e348907e177038d935b0f90f800165314eea3a7605616f828d493"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "563f92a47fb7f4d86d39e88458f38aabfd5f64cd3fd54e51a5572eeedc57a5b0b3bb86bc26837b2438623edf3d06ab37a94064ae9ac5a2431c3038dd75a71913"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "568d0da98615df8489a04dfc277235d39ffca0a6cf78e15eb04f7784be3b2a3a7480dc0f3e04a2d22bc35e6b77c0f23a9d90bc8c8786812c89454086d5723445"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2079fe3f54992ea7a7d2ce90c9615e748896c595115958e5dd018d33f743ab79b3325242171bdcdc49818692088698aab1e351d35c535cc854904d42e4ef78c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "10fa4e95d71a5a12f2c4cbc2b97c2bbc1301902d76b6dec99f16f55e73a4a8dfa560e4d8f2dffc347918405749c1b32c3c55b70e6b3b5d9e45566785ecb8d009"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "eb00d3f069d8eaad95a4534cfc422722977856af50d7477a427372ebbb1dc0f1606dae97f05457e6a5da3b7e1bd7689ece4ebbf7592bf7439a495170be6c52e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "11ddfff8f81de369d721a24c61696fbf80d636396b9b7464c2ec163f8009961599b06c97df6dd1a4494478f7741728c6220292b762d0f7273dc68be65ab05a6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "f8b13383b7f67512312fa8d82cffe4fa21ce1aa64e04d75171faff12c0aa3311ba57e0875ab4dec47e2c1db057a041b921dfd0919587494e571c57a14461ae5a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "76631fb790cf3ea88f35dd5aff6243f7577e200ad16699c206206e02a30b472004712e78b563f115124d3c7bcaf8fdd07f98e731a78629f93accae55a4baacb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8bd8ad5efcc8e8cef7d59f9be575e5314b2a02dd16e8244bae80864ea684649af8a8eaa2ee40cfff426ef6472802fefaa98d9a7389d2a5be870cae9b4581eebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "863f9b6f99a2f025351b7dc3f4796d8b04f2506424ca39fb5bbffe46d123b5f2d74a773af0e2d28b646164e52c1e9efdb097c91ddbf2bf1ab912c787e575f89a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "934c47c03281e90ca801e87594e0710208bb5f308a10fac386343492581d918e6342bbbabf57c2be959b9c894454d2dcce38923307f036a759e80b1d31d89cd4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "4d56f033f9b397bcce792017166db2ec5e589d5bc7a3b20e8eb4ca534db11f570df7fbaaebe60d64370325b8ba07c98874aa1d74b58a979090696a0e0bf77f71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e9eb7539cfd92cac77c44c9ec99cf9bf2c9b3d6a1e014d3a8e0b084cef05fd32bb215ff66323618ee9a7c4312732e8a471df5e63710b172eda304ffbac7e8075"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "9dec3fb45cbb51c101e8b2c22ad68ad508d865f6f903be9dfd8d818ef907e6d4d377a7b075ada729fb66e98187dffde59e5e669349ec0e02e632d47921586f8c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ed8d2995ee07a66e5be3b72c2dac6d0fba53613983ba8a76ce01c169033d6b9014de514bfbd9592f0eb6835884f56ff1ff7ef9e2ebd5f0dbb347f6f95db47f7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "d180080acd094e6bb7d5e5f2a3e8f13b0e4d672f4f4640786b14a481e52bdec7b865e9f9c970eb8f8987764cdb4155a2964fd8ad8f5c4c3a8d3929b3002f48ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f158b113ca2c05539c032b8c416c8f5ed022c81bc56f20a95e38e5ea641255b8f780d85c641e5bee2ad347f7b8e3cacf26e18a5c4095c7bc588f4e54784d3028"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "b964b35ec30fc17965483085fea1cd09450dae10602e04495bd50855fae48b44893f825decd0bbad81fed42d211d85fdcada39b24d07d48236ba208275be6215"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3c92f3e9bb5203a2c316e95e2dbb0f94607eaf96c125b7bb96f2962b9bdb5cc2f5d1df44f02fc2154c6da8b5b359177c1cd7cf5379139f43d3f0f0531fd8a03d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e27c1b36220d344746fafeaed2a92639f938abbc268f30efe3665c3da1f01a5990e961686cddc4143e4b33126606728cc4b70ae1031d8e628d156f1b2895c624"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f021cc29f230113577026052c5350d0196e144675dea80248c3449974b7bcbe7e19310c9324cc3b779d50c50a1445793001049c11dedb8841b9f57c26abe5dbf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "760cbfd406fd8771897b7e5f8646efb30f8ef769e48045b1f26f38fd70efd0def8e03804b649bc838815063c75c1e8309858b80a54301411e91271811d86560b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "813b0510a7bd3a1f6d6a2da8d408d038d577d051f600a195068edf7679868a259bdc25b6d3225aa52a3d83278625764deb4918a7649c2cfbb565e88b9a0c587a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e20012964a11e4d3d05fcd3107bbb9449d023b2749e4fb41a7f84d1d7c9ddd686be46dea9eb589e2e99ba60832cae7e673f8dcf9ea96b8219ffb7b6be3f82430"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "7b1b2c23baad1ddf53e1ac3e10ae7dbe8d963f2d7bd4f1b0dd1f06c1c3162cb415c3b11a2c08e4bc689c296cc1304b970d376a77b253ddafd92e54ec35d2bb3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "5304b7bb4e3cf2e97c8eb8a5704dd10c8abf8416b12003b85368154f17d777bcf50fc5b725acf3a2570c17db1327564e854e934a7364b67a4276d77d28c486e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9c2d778bb1b8db25ec8aad1566f2c1c05484a604cfc388ca2bc9c6fa1128ebc4a298e5c5ba4be416e7ef22e1c995b529903855154e4e732d5f3df33bbddcb555"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "6d04c7a7f2019fcb5a726f3d1f1c4e26530b6c19a4f7fa353f40c5ce5d79792270bbfdf2b3c03d0c092bbd908b0525fc4cef24ac7550a06c9b052bad6770e618"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "5ce1c0588b6e1e4e9336d937c5b8669698eaf88c3fc3a72a528cc1e18e5ad2141056efe96daeb892d86553211679a4c34e15839e6057ff9c891de3cfa4d89cbd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "5eca438952f9158863f72e69d9a76a63d02e1ff7bfb63bfdaa52a21c6ac1d7b693ef996b4dca6e869a688d2b829b563550a7623f38b15a6f900de24d696e9bb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "e5f65271adf2744ad36b4c453e3691cc14c067550c0f720797c3b7f92e74abb47d48db3b0d1c24df9285d1b88692aa18b1fa35902ea1bb08367a89cf238bf75d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "e9e8e1c989af0374af8d33cfc2ad35bb07351214316065162eafe395d54c6b8b0560b0447b41814967cb70639ac95f34f80251d48bda0c2b55647850aac77728"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "44687873e3fc48153c2685855fc1dd3f81ceb2ac4e363f7dae3e5a09700baae3c073de6cc35ac40bc8f1634daa446a8747d28aa6d0c8d50819e9691ba5be14eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "97184b1d0b7e959f6b29be6fd040e9e2dbb9a6c95a94b314103ab4e45fd369c3cbf6a755d229f4c5d862fbe31aa911d8c2fa2e191f929fb9fc456f1da46b324a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "073a4b720bff6e703b77ee7b66ec636868acbb9fdb508146e87ee6d5762caf9c03b835ad6f8556fd3485e9830a7194baf3e7cd3119bacd3e7d4ec8084805d7ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "86548875a1e5ad4fcd514545369affcbeb0a1a1cb4f9ed95be3c811659013ab134466a80ac2f8e085b77c409d8b657d39d9eeef289b7d2c3ae49a04315439c87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "79f42dae37ce34f2ccbc59efdbdf582ab5ad73eb9df8ac655b3e0a986077a5dfffabe7c11fdcce4660217343bcced993076caae14c3fc88e14d5545110252641"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "227375f9866434b5810c74a9664b913b567291c1efe5f8eb970a092d7eb6fcb8c70b99ace68460a8276af11dce88998aed9f194a7e9abda6383b56d6632fb624"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "bb5c9a2fde5e9e56d96bc9a0331a2a19e44f93e0f3ddab699e02f281313a9b19bbb3734e936d49d80dad5027443f40603184fac710adda1f5f2338cff138f54f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "cd723149ede0b48f3d44977be1ef8033f3b070a037a60bbe6af475a2975f207aafa73a78bd12b272ea85cd841007cdd825f00592c7c563c5275423115442345e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "af4216cb3be0967ef5df8cb17b7e720ae4a967dc2b9695d83ceb39c48734472f25063e1e9f2b791b7893dc7a44a99658ee9374a85d33fd77b143eeb2a09e4afb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "8654d082075f93c31c1ea1feeaa7383c0103475e3e2f129a92c1f27ccdcf8a3cb72b17c380c31b5b62cb37cf3bb5be95383359c6792ed7f5657d6f7c279f2c18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "9b23dd532d029322cd686d0cf0362ebb0205dfc56499331fcaa29f038aa2671cfa6d5f395e04e47147a7870852e1d026a9a018a417bc5a5447f82acbfd9f12b9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "65358e65b06ef09431fc15f9b6d6cfef343f8bb4ba4c5f6f773f8122f15e2242f2d26a8d6953d6fb25404d68e61c166d79b00483875cefda0f097c0d75bf4cf5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "3832d0f87032cbddb0ec42518732f8fb9a253341c33159f152ebad59a7d83234d56f0fe76c48503619bb13a59f2512691d94c3a32d0e85f7874a0886ad189f2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "82972732af96b74b5f69892e7a60d3a03446cb2b048c70f3462fd10d18110c0bffd7e5a9e4b36493d35f701e38dfee7a716cb979bb087bfec7c91d12a4e7702f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "9681c8d3e09a69e32d174129b45f49d422bef74c107139e5cfc5448429692d22aeff795b3ec457b2732473f4531c6ab0a3324d235fc9ff827a5b18aaa12829fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "0ca3c8044825907e543255ba66b4679924583cfa82cc15d59afad0d58b493a899025db15d24c69da7b4c4ddb1c83980dbe6132041955475f08816465bc1b2806"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ff470ff06a878fc1237446d8a2411be11513b8431860ab02d4d7b5e617683408bd97ada6dc4a85c2607e1bb7123132bba16d3f94ce9fd989526469420ac322c1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "2ae92c249786115aba2baaf5aeb0e0b50aae1d089e42e42c332062b245c34518ba0ba26db626ebb252c976cd970fb7fa7bf161f860ff53cb4b20dec73a17d3c4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "aa9de9557d2c9da388c40fc2bda1c0bcd52e1c7a069cfa3b2936b3c32d3f8af3bf5d385428f9eafc0106f4212def5f11621a52118283f787ee823beee59ae2e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "bf2af6ba5d17ddb9112c1abbd7e3c7f5c936e7b88023b24329b1ae24b2283baa9a691a5d8f9a807ad23d679c3e37516fecf8a8fe05331e1531ee0f3edeafafab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "04406c356da280bafd94e8dfae6c0d667b15d179106a60087a8fc798a2dcb1562e279c6591ef11e4f4783025699e29868054eff96c540cf88803ef13fb658820"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "03ce9231a3a2e01ff15f5e85a729ec40a38c6424ca51858740f0dd903936e428b611e594486c25d9583987af535133705d83353198f77009862dfb56675b0a1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "a62c52e5186084d1c99f54f3f5eea6218b1d6b424e51eed851acba784d16f3845bc8d119fd03737a3404710ff9f3883676642704431d3d7df462452130d50387"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c0a627bc9760b3f7a96a5e16fa9b13a356292cbd1abc5be795eb656c1099ef8408be04b090f4f32039485ab43697f811ee5eb1f70324d79304a57cdff14b57ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3e0e840aef1063ac7c553a1bf9ba5a5db63cb2553c0af61b9401a01c84d5e6af74ec1b7b8b260471f2d40101770e9ee6bafd11c842a0eca47b28dd83314d47f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "5985b798a7d634d01a427028a847ad4f76000a8f7ed2c1c14b0a68088837bed2e157c66137408e2a0b4567fd2bd4bf63b4717d893c88aab879d8f9c583f73c5b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "b75b1119708c4bbbcd41b88747a3c2dc22b090d2920831cac56373311e1a996ad558021a85446d5d9ac762ec95cc2ef736692a3c65a20f632693d51a6c1f2ce7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "3d375b16a4785fe3af8061ca7759dbccfbeb120b8bdc35a455e411be0a961d9a65345f5aff6b0c01bb7dbcaa4d4a7173117aea52ccb5099bd4ed714f38fcce36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "66a1aaf6d1805be3f6bf4bc71bdb30b7a44e916ccabbb57fb09aec109a3bbab62a8a1a669b6c1806a7959879700a0ac6c97c196d5a75079dcc4042ed789ee922"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "11f84f8b93db54c88a3d4b0ff155ec69998033ef2cc592dc4d1736129be62249b722a2d7817f3172fe5bad2418980fb57a48d3bec656837c03580ad9e65eedc7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "c9c3d4d54e5002aec6cb202f7e1269344eea1e9b969fa972000dfc85ccd2f1aed93de52176622f055a9bc5d639b0cce60af69b4507d0f9ebcce77b34f87350c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8faeee4ed9f69c0f6b3542fa077d50ae3c432709ff1449a91d190e0880d37f849bad199c1dc6d0f6d436203a1e0f8302f6fd082f23bdd8f3338e8cd8c938d4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "bfea8fe2273960e84dc3b3dac18d83b36cd0ec9f7d22d25733b36079cb31c76215bdc1862214fe7180229e6163154eef65aeb2b54f94895954d7ff5e4afec813"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "7995eb7ef1cc5768052bd28c86b547b60c949ce3c0f8089324af4ef0d654bce6c48750ae579f20442f5aaa0c69853290ecabe28f29f2796eacaf2af83e3bed87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "9488b18fddb35142a0a88ccc05bac3eb4ab3fc6415736d9a36d58f3bc88016ee8ce1b66e86739c34cabfcc89d2e17a46c282f9495599b8b3fc39be8e6f10b7d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "c9694b5aea764255eaa38db4091da6d9fad85d7fa1a67d1529ca66f9dd337818b21c4afda5bcd3fa11c6116bd65ef6c9cb3c7217290982ec10af5ab9b31bbcd4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "d3186e2c3c3eb3b907fc34aacb9dcb55cbc8433431bb76ac2870bd6823d7261d347819d6d8ea24ac042401d76c155d7efaa00bb81f03ca2991f16aa36bb87b8f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b09296856db8af2a61ecb2cf7b27da8ee7fac4598f88be504547f912aaf367a250c66c4dccde77c74588e9319cfd802ca296fbe178b1f7442076f67690f356ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "7cdcbf8199fd98e33a509043aee60a40df1ce734067a0a519770466e7eaf20d15d7f4b9942e0b589bedb67f7ba51ac1242bc452c1f79f2449421281d00606433"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "c8431622708478816c8e0176b8f55c3ae5a32d2a94c24c6ddb059322f0747b55c85a12be869afe41f30c03d769cedbe62c097626d6554de29e47d672d0dae502"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "79d6c04f251ea26cd78c095f4dab2252162b0c1107e73642836da53504929f775403e4f1872ceb8dccbf45b5c52487c7fd2a58c182b6e006e6307d5b1f854a5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "1420ebabc1d5f95db723a1493988d3e3e07354c92256dbed3ef9505d0fd8ce7270c49fa2401de1fe9fe53992c83e81debcdff87b2163eec1ac1ab2f860d8060b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "9e42c2ed46ec6ec8c0b33a51577e841fe8bcb36fbab369ad7b65d77029f7ca06ad58fdd52343db2e34f64ec2f85224af15a8a3e43f3112beac7c7434dbcacfe9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "f7726bf8745554d426321add7fd64407d80fbe36c47ba209e837ba8de0392a7db38b386cd5b5b104484b614a497b8792985347260f4c0465878c51f5396e96fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "cb0143438cac468d2e70bb53eff678ffb8b831a735c4af0f4aa6ae4b0d7431ff88b33d100d82c3af4d0d4d5bc79dfb8d4c4ad2f8b2ee8c0527cd998f286fe2c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e1321a23d72d292b50fada4d2e468924304787f107f4111a9c51be5a05098ecd8cb3ad6235e26ad5b60a264ad387264b0955cbd8596e8cfc6202acb937029c52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e9dfea71269ce2bb4fd44f613477cf202aab03268c87d0cfef6c05c4c3a36d1a5cf4b5d5a2987265e21722aaf81b1217d81d94f4b79ae447a0df34cda01a2b19"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "196de192baa7abb85389257adcba33b09a1489971c6c2c92ee9166578a24aaef19fbd42fb039f671ff590ba74ba7fb1a0ffb90f2956369a14e08c04845833943"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "61f5bad2236cb7a95a9910814fe23cbbfd81e039e9ad4e7218de7f49ba6db604a1376c1a0ec42a866a2fc693778e155a821fcc654443647557899427d1e4c2ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "a823be574db87212d9f822dbaa32cfa885647ec78cf10e465033afd6cac8adeb98c4b1c3ab358d10db76b4a02a73819df28ba4e446b2e4db42c406a434a5c2d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c432aaa53bbbcfe0c38c0cd5748d0b34dfea245302407e3367b05cb35d979b16a7eb669819a62aa0cf3582ba31ce328dd21e812a129101242b1543e8782c4a97"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "5734973be02d5929354e8dd710b03367cbdc1b7b25f2341057b5e7421d3c8b5ebef7f4674015f385aaf0d8d47efed4db7f1dd17fa53220f62e15c1ecc81a9889"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "b1f9a0b32b09f2658544cea4995344b8faf0033133a84c996b65d73dca608d8260f257ed2b981a3afa761d02d0669be866c9bce7324956767e154f637b3bbcbc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "911497ec90ecdb400c7f43e711ba9e0b6ab1160288d45c3d1d293e9c847fe98167bd3400983915383ccb6f21d057374ade755b0c8e42d229cd178a2fbfd0d397"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "b2b5abc20a1fda08c2dbdbb9f0ffac768a2902db330f0646920dcc8b72052893ec59c861d8b26515143290454e20e64bef28617f79e885a9e884088c74f20138"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "5816d9f28ea308a3b5910ab718898cd6a36bb27a9f9f273970c8ba86eb7db0be2d39b7e616299c2adf84770da4d98442005d1a87503083da0970a05947cb14ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "1761fd41f5d1c413fa4f35545f5a95df91bd5625be110dc1257b9ee4b3480c2a1ce3e7294dcf4825a412b43fcbdc2da86147fb6d8b004137ae0bcec4cda2ebd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "83f2f053b5a592fe8070d5c01d17a3ca4df988257f19e4dfd17fed6cdee3886cb42701d3aece737817e1cfae7f580c63250b404ad847dc408e2f967b7b70ee32"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "ad87b6ae4340041aa7335b69b50f3ddc4731934d25136a0815531708197db9c6b4496ce855d3ce4ec9cf942b594ebd18ccf997e28ea7e625caa7629ca5714fb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "3825405b73375aef6c391cf0e6520f3c9283178b8a2daaf3f5a287a9398c9978d90ac33066fbd114728e7805555cd440a9e2d123c62f099e71a77b13f959dc13"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "221029fa0cde5873cd3908c445bdcab03cdf3fc5298203772b6157342f73be7d60e460546f373a50bb2ec308038238da5906374dad326de9f950f838e73b18a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "017bad22c732c2c5d1d1fd44dfc6423eff52f489513e05ae178c61a48376a6353243c2fa095c3acd3a8bfcc032532ef1b046600a625775e6ec5a0b408845aac2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "a38742529cfb00c78d3603aba4d1091c4c26b7a4124afe6a976487d3685e92fa3393d2b006ebd34315c9cf8e5b07e8b2e72eaf75669e1195bdcefe86331827fc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0e0e785028fa438957f33f9041be50d0912ba1ba6fd4f5b12b752de9aee8883d6b02af3f62397b656ea802f9c2e0606211bfaa96d7efc47afc44cbe35e18e6ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d9ac8495985147af065da832cccb059b211b0fe66bf171450d207daff175ee04388e499f4f70dd656590689f1fb1d21cd364045b77a96f0304632325ca2d53b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1b46da4872b9b79854dba843f1a340b01969a9c6a9142b0d39a9f9bd7b984f36fac21cf3097d75855e818f34db87792bbf6801746b5a59936b598942c387d44c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "3a9966017d4f55fe07cf31f251374281e827bdbdf6f88b65236e14e1a7cb10f09de8a8610d2d21a991896854140907d6a7e8f9caa34e22c614aa403558644e6c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "21cb43e55ff902380463a2ac896d64625d2e65bb824b49063675c80049d0230cae089736445910d84d0123e474d6e8455ef310593beda8b1bfe950e5b0fcb6c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0e1e297d8efd180c8312311854b54c9f64367e5fc3fd96cdae55d47001807eda48c8e2bc9568219dab453e2324b2b5c6c51b72e38c15d4e2c2a5a5fd881527a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "c3a35b53d04472c58714a6fcc775283754df51055e2afdb1765a8879d5b1af20ce37e6100535cb0687712a96b02ae41875c9fddf85b6322ccd3725824a1d804d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "efca6bdc66cb175e4fa6c263099c3aa6407dca7a9cbb0cda9f00ca4ad2944745c0ae576848e0d58b4af59d66b5f9ed8a426d9674d2cd24b8e4d04874763b4324"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "565f18d139594b5cef133bdb2f873f6eea41d0b6345393bb825847dd59b60da8798ecd3be71bccf7cbb95829b668a0950caa5129d912ce534850ca76aebb52e8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "a1ba2af26f386ed8cf2263e32867fbb162df85f6992109926d5cd102026aa554f246ef3770f3a81effc9019cdd3efe9e7c4713e43c778714394ea981b53f9c30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "0698e8f4c618ffa6db6d2675ad2752cfd8187373c43f815d20ad92bd1d534ea4f4ff3fc97c0a9c5774a58c63dc5faf024158ff91e402a2f1ba5d1c06550970c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "b94f265ac682bd5c879b13f02189afe1aafb6a8e668b39bd3ed5fe145aecc54b1ca62004ba7d770fccad6abf0e259a1b1e41a4e6558a03b856dcebfbb8f21c2f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "e2644b2613f1c36549cdadca6cc9339b1b2f60eb83cdbe5400663bfc681b6c096ea610279f66969272f2e766ad7829da06716eaac13606ba21e3351521846b68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "46cf0673b2776526920030a9698077ad375af2eaba80e153ffe56e34b7066e7c1731d9ded70530df9db37f3b99c658dfad9451f32f8344a37acef38444baf6f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "3995e32ed9acdc2a481599adb2d6ed608e1820aa914da2b6da3cebf0d229f89b19f1355de7953d74de6815cf0eac5381a4d99db5a5b76c3874076ee800a88ca9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "dbe3807aed7ba5717197ae2f7c8c59b5aec752ab32093a0a103ab6f6f34c298fdc7718bf1f367aff1539871077857ddbec53068fea27c4c716eea0bab6f4eeab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "311be32d836f56d49d6d7cacab0208702870063d1569a83f30006b641586ac2beee32583cad31a75638745e196a6d2d309eee731dda5acbcaef865380c3940a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "37d165529b6b8a34f35065d2d5971892c95c9537b24f20125242a8ddbf250efd5049c82299c70694fb5e591fa8acfeb68e3cc6222c6d60544448331c199d3f8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "23737d6c1bdd91c9bb0256ef9ff9708a8b082461e62198bbb90fac31e4a6d077b059e8da7d0b4ba63d52e0a6cd6b244eab8b0c038fc65cd3da66a0cdd5fe6bd5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fdfa30d26dc561f829c56acadaaa7dbb53def9c6213efe493d26954a621291d609d1e1400d13081621efe5a949ac33cb89655f1715430ee74c6d43518c35f95c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0b7e7b790183c949418d67716326b0ae13597ae21f45ce15d0d9bf62f09f5f9e66908b236f5d5e8d81362d193e1c19da7307dd2528cdedff50ece1310f8cb13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "cc7690fe45edf2173f1a681e5a0507e31fd2b4a347da5fabf4272355001d9f09058666671356cf76ddcf9c98344921bf36a8b1f94eac6ebd484348d73a64506a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "b599c718fc82cafafea71db2122cbf5f99c7e64029956f475ff5ef40959de07bb8b9b880459e5462c49283a9d94763457e6a9199cd4c88117a66d7732357a507"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "7b974ea9526d431edd2663dfa14852a517546ce222834d7b50ca132abd787a86dbe4b4bd0b347ad016bf458551ed275517a45fd4322783f78de4e82a6ae88365"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d6f4256ac05bdf62397e243ccd2057d9a0920bb9aa9edd0f91aef1bff4f3cd1302acd8ad212e9508b903a97815ad9488730c7795538daf42d4521e7bd47f57c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "a7bd4c547335e3e54cf035219410ffb60a5f8e621c4b8459a2e01f3956168d8677e7d1892f509d7f1c2b823dccbcca71e21d47a83b189846a2dedebe9caa345c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "b539ffd5a34956580f884505245ccc64d3b15192b27aea72191a923065a671c1a24077fe7092405dac05b081b98016b096145fd096847abc3b3144f0e927ea75"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "0befd224443852cbbc861e72405326f957637554e66041376799ce0f498877a14bf63d892b3e779a182f7f4cdeb5e8d8b688625a7d5f7529ae6fc680cf35a01f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "016957d9cb2208da775061c40a0baf66fa348d5426d6ac5801d9c07cb984f6faf85013fe9508c41281a5f66011ee75b28d4c02ac5d37a1fa4d030e9ac640990a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "0192f63869f98f0ea09aef814f2f52f7d07d6e42e2d4d31ce020a9670df04808e3a2baba0865ec8f685a9a5156c7648282acd16b4227d461496e6d76c6ab2247"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d9aa202a12bbb81e2e17f6252261ec22c570f03a2b178b73ccd316c05da2c50fb590ba3ef78b067f681342b596fe887d33f3977dd9fa54b9fa5f78c0a36d9931"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d39aeaa7cc01181914445d5e3cfc55288373a05e6987e4c8e3be37743fc99df6c85c47337560f9faa38b826a041c52f6314ffbb3fa4e2593d126dff4b0bc55ba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "05d043e48522191a959da5276add9ff88fd009c64b705397abf546567c677f874f640addb206e35c762b5ad614c9b4dddb0162beb9668ad28b4620aa5a2395d4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "7c2e513d00c092d205e0b9360dd907454b87f705b2db6b0cb88226ea3456aa1a0d7d45bf7560861b27fade669c226c48bf08d24b28459c0eadb4baf3fe947433"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "cd37b2be51aa96a3848c1058fa523062d79422e120a74eee2cf0b032002a80db2c07fd8b43fe374e0aeaf2425a72db75fe77d3e5928d1f8c4798a763d33c13cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "4132edd33d3b1195e5774cb4add6b121ade7dbc3592dea69c5f45fb74da5b3b2e851e38df05173b11a011c1366fd2ab000ed4ce1d9eb7a1b6d0deb0f1d8296d1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "b2e00d3f5eaf76862270efc672f50043cb928abefa02b299ce519d420ef6ee5c65ce8710a5a49b4ff6c72762c7df0386c2d4f155ac88f3853206c6d7e0d0e36c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "a8ab381099673212aa9370365aa26099f418560c12bec5b1094cb7228cf2828ed396da60fa7d45b6bb3c2126b69d03a2fa76124d7df345673b86ad5434c59ab8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c61e353e30656039adba5264e32d2f95d0d2f2195e21250134b3408a62f936fff3d26caed1122964f6cf4b1120dddd6b17631323d21c93d7c18402559a0e40f8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "f3dd25ce556793bbebb5e23ae0b380bbac13ac75a4a3e7c23103a8e6aaada84173f67153dba2bcdc40e2f73b9f6faca40ed1932fe5e3e5e3dd9edff67b7eda53"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "11ac4020f61a185ea24c3ab3ee3361c11275e44908cc4be1650b523bfd356dfb3b8b065ffa69d32ad7b1d4f54d0d2369b1a18779e27871971bdd9be680aeb140"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "5e338e90d23326d7d81289ef44d688d8d45d26ccc57a8888be64a1fba85277527c05a7bce0395852a15a1b4707e146503d881e0a718303cba37213c8ad85189f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "7157d02ac19602acfdf67df8ec4696d13cdb433beab2be997d0996b45d89778fa435c2f92bbb7374503d1241d8a9c62a5f3cbcd278df5dd9279cce8f75481c21"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "8d70071d127efbb5b7591966e615ad8c49a01166c654d601520b72b04170523f8b5e63bdffc92e8a34b28d214d0a683bdc3a9655c4295c3c98f87f510b0de7ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f1323f32618bb81dc0cf566a9341311050364b68c51d51531a17133b7b039853d94b80eec21f1ea9f76607d9cbda46ad15b4eb378016e753f3900bb060b66a35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "6ee87d5d96419749638ab4adcae63f3d9e6e397ef9f8cc30ad93d51adb5ee08e2381f48153a785f5e4694686dbb7d43bef3bf8a5ad161f02f3ef9f2f18324592"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "6b9bb4aed532011ec4a66d7a19be6d68b7efc699e56388141d0a2895d52936b2c5037e44978a67cbb82e5d0098270e4615315ed2162a6f4f112ec0bbc5c773b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "2f1dd9d6c43fc8a49262b3ed3899a1ad1933ffe3491f5af7e3c3071b68fc8f1926efe2d0c159d8e614eafdc365e0dcb572b01b6d874c404fa17024c38ad7950e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ccd6e9e49c5c784da30e47cbdb275318b857d8da1cbba6df1210890f6a3e027d791e176eab60964904c0c27ab33fbaa29001119f7ed928e2978a8bc6f9b6e309"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "388e7cd5c6914d889c44a1246b056d6a2f4b9c1f38d08db34209b3d0e76a3caea0269d137ea66890dfd3f53f404ca101bfdb27666484936e49a73be01af5e677"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "ad41de1ffe0b2358f9ddca8a0e161119933e966380cbea6648216938371b2cb49c9d4f9646b4d8c194830c0f20b95c3f5d74d674316fe684bab1668bdcc88f17"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0ea2b935a8bef6e75b1ffe0ad783217dbbe1511480aa8824f3b1cadc1bf67327b45d77c1fff7d27cc2e4d1def0e49a8dd4638781631774dcb6d08a56d06aa96c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "ad48892743f3a804776be094d06ce69187e1fdfb625def2aa33cacb5353521ce5ffb3eb142b96d08a4700264e9a6d47f70fafbba1d851b44f7e90f52143f4334"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "7a1b83a505bc6af3c856bcf33652925cb3450a5dbbf3eceaf06ee82236cf359bbb1ead70d97a4338df56bdaf07e668d8fc82dcb9335c51f4ea2fee4d51bff711"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "e7b53e5c35b63cc46626896d69b01a30630d4a4bb700cd824d96221cd3f20d51edc298149842a8b23d069d2e02ff7905722e93fa9267c72dfa82ffb8f711d930"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "536bf789f33ad59d890cede2583af3952c5ec18a159e5f8385b7acc50149d398da91bb8259cf8ccbba2740d0cce497cbc9d354d75dcccc4998ca04e1f2c51ede"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "9c13de853952915cbfde787bd8e66c5e1f331069f3fc462f3944228fc552fb5016a908eb28c8bc30f8ff298e0f188f07e2ff8b1141d5cb575f8ee9e0e38e3bef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "0bdf31dc9eef5ee0d8ccb5da3001c0fb0dfa4613311bb3a389cc12c4cf370180ac8b0917980cbf2df3ab9205eaae35edbec60dca88624ef13437795c174e8c2f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "18d8012a9e9d55b93aebda9abacfcdcd2935d9019f77d6978fb8b02b5c16c07197eb7f08bcefa86813fba195df87d22d5007f6c1d208c37381204e6c03175b68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "77b547dd21e645aaed68e1a263bcf91b2101f05c96cb051b787707911ea9b047f73256b26b28efb790d0abadc46c44f304cc3f2f80472778b5a1e45d294d9b23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "60507ea94627f172cbed941ed084e803ff5ae814f838f9b0b55993878acc78fc9bf73e53de2f0314fb59572109da57860a5df9b7f7815273a8db73d70c400d59"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "d920f13bc0bcdef484194a6b3a48195f5d3e7686a828b963a8d7b22b43b024b53eb284cab548b55de81c97831b6d3ccb2e88eb79cf715c94ef4680a4b12a5b7d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "1b9cd4182f45785b927da9e78e52ee6966194ec4482fe6547d7b0e1d6bf3bc66d1a67c683c1f716199db354a373d425f32861d3fbc4ad2ab38aa1b9c21b847df"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "9da2ad5723dc8d5c0570afb906b0e5808110702ca634a631454b082dc70c8fd97a9977a7c2e656d5e259db7d584dba3ed3cba9b2f45183fa63c03b2a3605c0db"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "c05a6ec69e1cdb8493adda32ff9ddda4fbe03d1c23fb6007b67ec693a13bd50bb18f6f821c4789ae40746f4753c39eedb514c7581ad51323e8f9ae2c284766e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "2ebb5e755115c19961a25b9ad4598a03b3263f1fdc096b873577c2b5846d4c11b94cc002e2305729d96be146f13db5daacbf0575f7931594f4e49adfa597faa3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "26e1674500b1b15c79fb87a103d742fdef100dc6a2895d4884626d27c94a1c897335263dfe583878ed92bf4e66e9a3f194b2985bb487560317bd340bf8c1ba69"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "e6b94b200294d7fc6b8be442dbce0424cebd039ae840453bee17ffa8ef14a2785636f548b7e79e25ecafae202fcb53211b4fa37c29cd3b2a24383a1c54d78462"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "166e20eaf5250e307dd2878156f325cdde93b10f947e7fee461ee5fce4be61519ee07260231e99024167cbf509c88828dfad072cdb38749669cca2438699e29a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "dbbca6eba73d6d5ee158b08dcef536563ff6a9f537126858786e6a39ac161469268c26c92b6c1e89a546e1fd68e14759253100459e66352b263cee5cfa6ddde2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ad006b74b3891a7bb6b59b4ea4bd70575c670b6acbc337bf6da14c0e464b47c55ce63aef05a2a68f915a9d32e455b2c0a27927135c809f2ef3035e75a3c60f5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "8d4a273f5e9e0a6d43260d11914b8e52b62cf0aefb45fb6da8705ded079c6db0af5d7a7ee70cf908459cb76dbcdaed2be2a09e8f8b3f0c7b689ce910a35ddbd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "8339683787463649ea6dbc0f761e658fa92b6fd8c8a9160f95686a37d10170adba6cb64ca550ba5cfe774e3700ac8bb95b33737aec9887eeee86f4323365c0a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "893358e845b50f024b61444ba608314a574e91943440a40a214d69a233b3ff5f4854d86e5a2b90813ab50fc7ca01a009bbb22d69b1b5b5d3b3603a45e30dc512"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "a1c88e244c73de9922487f00336215c79dab047cf2c57fa4a8188e434489163bbb7da586daf0ad051510278bf0af703a26a76d65d265d0dba23d524a53e4c11f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c400ef2dcad7680b65fb50560929c73d9395fc10300c1aab13e4a1c4381514f0fbaf9b192952a5320c6e39db002629f0d27b3b1f4d10ea41324dd4c97fc40ff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "eb6fc7526c9aec0a9a2634d83ea7a086890a61112b2a66747e7bc6b94cb0ce07b48e362cad7873d409a893dec712bee5ad210fa10806354d6dce60dc7daaec2e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "6d06c32a47d7def8017e933b6e03cc01fc35ca7dc32eb6931ec6c749b6b65d59a6dcff119b9a51fa949d893d0f30fac45bb0b52be3ccf1c519ee1c469cff1e24"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b768ccd8724854a810f0a9b53c5bcfc1db6373575e0a7c9d9143b674e1aadc5dec614528340732630fc26a227007a0aafc99223c4e377bd1b9d16ba78f6a699a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "0445c45bc17a57022f09df0e9b3545c27fe55a69a431ed6feac4523b632617895c48f2b68c8d0c9a92b0f86a345bbe8821f5be6ae072e76af5d7829d59d5dd9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "1bddebdc108787ad9d07d3b782a1ff6188e88108a508eae890d3588cb89bd03dd8c84a099f5aed8696cf15acc2573f112ffd352247470a5f04bdc439ed8a8e69"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "7aaac17918fa6e595820828049952da22be67cc6cd248acfe89c47d8f92af35983d79128d980e889ffff809b1af385086e71d3d637cbb672df36209a1bda90a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "09cd1a3961a2636f257eb0edc073960368d784ba4f5b456339b213044898526ace726406a47430f75b7f4950f5e721c5f5eb59fcda65133dcefb5157b3e4c258"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "8cc67393779a6062799dd89c656790a0bf63d3354423298156bba87357f94e0421853795bb1af95bae932ce2541abff620918ab5ef3711e48ef1687af9dff2a3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "5dc4ab917fd86cbfad7734ebfe57b21a0546c7c5b5eaedf55424165b88d5e847c512c27fa94f6be45825c198dd2d625c18b6f536aa03b686e33b8920cc71105b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "81a6d8df939702ec5c02c4474a1a4122c6f622c09a53da83abef08993e10aefaca3f3e0837919b7c5dd198c524a5fc53567ae41010c9194739d18c7d7ccdcc09"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "884f9effac55f297f40725a480b388eaf28e15deb4e462ab615c2c97e44827492cd52f5ec9c6b0eb0f8adb0c8b5e41385f2f6125d5a9ba00d6ae7beb044f0d62"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "629138d559596bb7c9791b33ee3a5c81fd0805ec033d7e6f125cee4eecdfb3cc9337b5069f143c1f56433a6c663bef28c70f08b422ee37ace80888add3747d3c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ff94c3b07a985bd184d6b17144284eaf60604845a7854c7aaa4cea552682b4340dabc24f1b65641f45b17253eb9239cb0c4468d282f2715ebeb24b993f17d96e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "638325ace5de570b0d31b72caf54a82c406146d13328ad0c9d1bafcb19331e181f53f1db55ad406ae50f1aac8390df1b3f8f51381897b5a226359d7188cb1eb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "4bba9232f6a55f28403a66e7a72decb2a212a716ff80a14daae6798939e0e2593d926e25c55262d43e35844442480dd358149dc674f62314b6ff858d917e9fa2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "aad773e41b35978d00f991011276c70773fa78760f40de4b2f2ddd6216f6bbd503dc5a9e834a21466379499a8af06707ce4b44ee27f624a68fbcef808e2f87a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d642de8c388a27f59f3f7b54d3d497d9eb1444d5c6af69bdd761f9e1e92ff381e7ff8f0005b5d9a2ad796acfd9adf64d2620a48ac654c161529fa88a9ce97495"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "b8d8f2fd30350b759b05a8485f98645a91ead02389e93dfaa6eeaa63f65b6d75a58bdb8e462d96fa79b61a161f82f1b31bbbaefdff99e703294ae407c60aeec4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "acfd42a744185b84018869d278b1139c9d72edf23a5529acbc35cb57253f897caae2b3c296b32131897d8072e8bdba4beb1e5134b7a740f40697b0a78fb95073"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "62c000fbbade7c1f5dddaadfd0d718faa6150fe6deb759e76cc0e02d05827f5669b1c5e3f3dedb6e70e4d5f900951af644729edc3e34b665679c42667dc3085f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "433cb00cc5ae251c7b9668217835cb7bd359641a7e25089d9bfbc8f2621624359b0b2a2590c08068a8700d32c94547492c12fe89678d64df376a182020adc382"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53d4dbb289a4615aca4583edf503cbbd5439a8a89567029f3aa894ad4d7a2f8ea3db42982574aba21b91fb14af6615dc145ab99237d612370b2db93016066927"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc23b6ea54d06f35e81146f562a18e9d83fe50ae7d52d98425ce1c313e44f7e45b09546c3542ee025dd4348c17ed20383ba7204a9ecb6af2345db196a14e6df3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "6226010373c387143794ae1e7ac0816405d62e648d3466677c3ed0a6ff42de78ae76d7cfbacb94caeefccaad38b6c3df921dcd4d6358b9764b3dfc124b8008dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "bec1ceedb067b1e3ffa168205c3badb4ae9bb1d9829bb9ea848e7d0e70db91fe3e6d814c24149bf16862dcf24cc66b529323f438aca181b1e6636c69faaac510"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "0e6b15139883ca0d58d05b065c79c7fb6b6c2eff404061f329d9086d63e9e7c9b693fd16fb3a356fa0ecce43d640039b1e92a020fe0569b8ad8eec3d92ae16f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "317cbbd21ad133ea44818429d5b3e7c8053395d69c5528a14b44e823b24deeab1acf66eeeafbc61a9bc502eca0790ac2bd18a8e6bd24bf2a19b6f9b7eb74eee6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "d9b518614de4247694d62871cae1f7e4e66af848bb7e0f4b1c0cbf77806e06a9d3d8062a6baa8b518f824d4f0759bdd76551525e55676870d3b18731eda2ec45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "33064b1626d1f91781b85227142f912c93454582f0d220c09ca9cf5abbb3d31d3481d342ac91a7b79845b9f86755464cd717008084da56c05fc6f78215366b2d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "eaa227e027416aa7fa8f654d3067284ab7b7afee042d69af1f0a5d873257cff50e73b13744118cef0b0426e1e5f4884b7bb43adfc1c03cd317eb50d4131e05be"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "0c8f3381e15495c57a5ddb66d01a73d5923905a02ae58d0a11b9f983291ae6b254defc40e285e1b0c3e154ba2ec3e3342231601b43f12d705fdf5b500108cd5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "55e0e3ddc0491ebb0c95278fdfe69c7a807d6e06544120398685f7856ba9a5fc45f491aca364049a2994641ae1d28fae856086dd0bc32a0f50e9919fff585002"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "4f563ef8581404f24fd7bccb4860df6f7175a5992bd432a1a39f4984f67d33642255dea8bda3f319b505a0750c91b0bace18f674d1dfc6d85b5671e5069fa5c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "8b3ffe3626f6520cf421a4b41f4852fd09043d917b586677af9781154fef96c721a2d799e11179d867c38cba5cf1826a4e17569d0165fa99f2e2e006ae5ad371"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "a543b8ade4ccfe8d1ff0d107d9b9f86715c9dc2dd633025f82d47f9aab260415f2117f15f7481c6313d3f71ce455c9adc1607ed38a12bd90717e67aa987290bf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "4c56c4804b9296766413c503cbfb4db42c2237dbc87cccdbf991ce7cd57553e08b4c67dd77cdeb34695d34145dcec71a61107af3687203bb21ec773d322a03ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "76a41e342280307d732ce4f6b4f35834367f3585568fbb0c36e70f64b3f274eca94392a0f46e8a646acfb900b1c6005117d508a258a4989758c89ad08f34bcf8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "bd5e0abed8992cba6532d32e84919e77de01691845045f98c3c9d4f312e48d83ea1bbff27567aa9f4f9f486dc3a0e7254bc5fa75606f1880de085adcc1d08285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "880f88cdda17b0eaaeefa35640b09690b5410a4111d02e7260c3d57bc4bc4389731707f183abd34365af5a4937b34c58d31db210370146855827463307e2bd54"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "8c1ae96efafc8edda4b23e8393011daa7c801376dd67a49cfb2d509d8fb3029ca75942dd5d275ebb0f29997462381068c09fb3fddd93556de3b5acb1fb6b8561"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "c5382bb928d5ee83aa5e122df3723126eb1151d3a26ab2c364c32c05e3f5345ef420825c67c4da32467aac123f8e245dbd0675bd16e9638ac29f0508bbb7f2d3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8d889c17ef408f7095c451f896d5b1e5f73fd5db42ae1a3fe9a0eae12580c6c96e0ae61e3b78de99460efb2f02dc035c71c96f137b16661e310b8d7635914303"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "f30d33f57481d68632830804e1b75f730368954e23ec7ebb1e907abfe5d9eb9059e3288dae0d27a6298fd6a658412b66706d81843537967f92c04b11abdcfe59"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "6b743281af9c2bfb40d02b92a4d4b0d2abb23942032590f55cb86515c71e42868eb680ca8ab44c46a0610b7fd877cc95efe28047bb95523cc2d13538e9de68c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "70822ebeb495fbfc7cba878e379ffeb3395ad90381d21472f242f12607ea95fa6a6bcd2d8a9b87e2eb42156d2cbc7fd90abd144ea47baf9d445249a78d3eb6bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "c2f20a9bbf1f8781ac11a396bd5580f171c025f1f4abec85ee4b96314ffdfe14cc8b4abf4de8a3907065f5b1bca55b39590a5d58c06cb77e22d636604f9a7ed8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "ed6c3b7f023e479a7c5bbf89ee1769534d697b8b5da3f1ee9f37c2b112adc44cf4c61861eea4de5889ee07aa2c26aa078572afa60facfdf9bfc9245339657d29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b826a6780d39b036c5ca9a34f3192dba8f0503f046bb20e96e9f71dd0d43b5a34f8f3998a83f3eef43b8fdace8d3ba87ccd740983b093c6007bed00b9a4e3292"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f7f9a2a255465f99ee6870e5a92f11315dbbad0bef26f1f1a1c406bd3c17a52a1304fdf174fa50f80c22fe014f025c28a8b061395cc71ff4552718af45cfa48a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "5960f783f95b5abb5321dcb0dee13a678f82c1e5bd314e1964b34cb9bd2f982149764cbe388aae4f0f727207874feb71749322e0dbc517d5195760d524650cee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "5f67df3d948ba0b4f8a77df006d6810497984863abd3f63dcbd46d4794be333a3cf7e19b22cdf70ade8b3cf64561c71faea6da34787aea5f750c588604778156"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "242ac952a3709580f355313751d17a5194d059851c243ec0cef702984ccf131985ac0ddaad7bcba8d3e8ef4faac56c660dd2ada65555ba199c9b5b0c38d1ea68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3058646c2b1933036118e4cefb5fd2325c41ecce7a03f2516c041cb1a09b12988c2301b97ec1ab359bc351800865e3a652bcd0b78ce5858738e81366ef62fa29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "cd1700ef9ba9b0554ceb404674ff19cd48d54ab811edac3112984029b96ecd2da34c4f7f691d2e2559e4d6c9a3f312eeb4df20c58203c1345d7eac9fd3880856"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "1c827b5805c84c14dcf6a0ccb30601aacbf67cdd546560a53451daa223bc4d903d3165ec4dcc20d8a6d5f8679a9cf5fd325a8ae3f463711311702ecf2e5665ec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "aa4d58092339a8506cd3c07ed15bce36f56975320e53b480d84f1c3130ad895cff1d1b9cd02bd405f09e4d8f9e0d37f9e29dc6fc3102f58a75fc2c69f2673210"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2b673ca58695ba9a7fcaa2570521529d380e725be60091191a373dce6f1e0986714b22827054580aaec7b756b4a5ab7bf88957ff7b473b0b775cf3e32ef1a67c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "5a3fc957a8abfb7343f78a61e68ed31513b3c25e8211203ad78719bc8c1bb42b4a1740ec8557da77340558844bce07a1daa3d95333331c0e39839cc6733096f8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "fa455a9c2bc429c09aed09fc307c1aa9c5cf285c62bd01348d733c82af840d851d3568dbe5c5d3b543d999e61508f19f2ab744a5dc34350d31471ea1b0179c9a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "2b07ce2526bde8dea2ffc7afb9a0c6b97f9ad8a3203588419be84ef2b5bbd9064339782cf00007b3c520e61207ceeac37841008a057f663f2e19d03ce22bbadd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "88a70b7eac8987782fb63821d4ad9513a493b0f75e51b04cb8ceaf3034a4d1148bfa75bb588c128862706b009cba24f2e0091f511d542958672d6417e252ddca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b924191e6358f23da98f55dcfd2a282598db723d2b2fcb0864e91e77e220e9c6a2b9c7ac37db11230ff206d383e87ae8bb6df4d799e6bca87f8ee006fd2cffd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "fc7606d53076e1972c09cbf3ec300a596732e301ec3a847030fc9286e87385fb017672210dfed4a5c3f0acd0e3243abe11b845632c89cc082d2118aaf69daa68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "821ce0d7c4983793da61fdd1c056072c7ab2548d75eadf511a1bb1fa7d155b2908874e4d6420d803069e47af8f6271df38bb572f6eb181224800546d82fd6c4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "19bcaa93dcc165a274826e8d646abc91913f586ffebae5283e608955bc0ad7ffff0ce94cd497544134863368b9761aa0c9f29403c176064381b45d108ad8b80e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0e5a248810ed4300ea8d6f07ccf2192edfe1c4465bd192ccaaffbaa64e9a1d0128bc63d7aadb2977c05bc4d99654abb7f30d2ebadac6e164d0f77c058d20df6a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "7b9b805324da5492ae85a0a8776d13f342c2222dd2c905af162fdcaa74d634891cc6ac2efbc79d39dbae333a6d8e0c49a2315b326323ebd6ddf724ce3067996d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "08078f738b76f32d1658a26f8ad0d16bf74c397d35ca57631281eb0d651a1f3cb04f7a3e428eea143520126fcd5ed7786f2c8d89c5863795ac807eb9d214d5fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "908419fe59a3a1186fa79aa8a2f6ffc7f55c0bfa32c4d9ef2ef29e921e0acaa23f85071eb7657716c602b2368f7b28b775ff772b26d8ac46ad630258488b01cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "15bd2c20f3d04f0ff4d1f47391114fdbefa46013928f825daccba8915b97bbc99d03b3c8fd80ed147ccb00cf1338a9220bb6eb4d09ea2ca7f16d97571d36baa2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "44126c01c9033b8a8f260940710774285dfa6ff35493b35b735d83858827b94bae0323148f0c95e87976156ecf0cc9a833ec52d882571a13784f74b12067d557"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "a167029d21205c7b452b569aeabb75a05f6f6f498a7b861fd5b0bc803d411b0522137de86feb618a247e33556964da3645bb91d45f1cca020b6453eedcf238a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "56636b9a33a5f681cbd2ec6d4fde8decf1ebe6477108bfbe54c13c29c15a2b5ab91875b407c8fcd7f272328dbddf10b36f2cfe6148b3a77f93acf22de0f29481"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "f9d79d3901821c6813d4f204a6760abe219448e0fdf568953d7ac04d4d87113daccb69eadf9503f842bbd13f7ce6a83e4fbdeb31d1a6c70051050bfba56ed025"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "2ca3b158a45b6b3943adc21d56cddf451a3ab7521af3934ea0759ade5136290afa8ff2c7ebe7bee04537c869d665cc0843ce471a2a8582d998d32f38680bc587"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "306a01f372b1ba8c59cbb1d67834d2e1d9a255ac0bc784c180c1da67857b439cbee253642e30fcf400dc8d988886403fdeb432fadee5dbe297bce6ddfb9fbf74"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "55fb61f100fbdfd77e716f11aa603b27e992037fce2d4555389ab4a40edb537621741a8b18fcdf150625a7daad4395d806f4348a364db37c708e199768e91488"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5096ad17de32e339a3bf4556ccfdd50f8f8e738c49a0da1cdd35f04af4e33c0fafffc48f71bb97b6fdd72f420ae3c5853b3be5c79ea48b5e75d85170c6565a4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "b9a993e9a84b93030e86e2a89b8b93d4c4544e4f1aff0d5c9be31369e9a5176cb256567b5032ab93e959ebd4ab3ed25db21fe890fa75112730ff4dd814029e02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2ed8b33ff8bd34d546ac7b0dd63d7ba01e39be07f5f5a23098eab5016d487f28b1b0563afa2101d1575a3a1c7abb1e61b8d8e46ed75d8c2b8f3c55e750cb2455"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "310e913b6bb487c78969d5d5cf9318a6c347f70e914d87747a2ec03a6db643a1b3816d4258b1d258fd15842850af48dee96a231e998434834d8999b8461de784"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "42273338e5f38824555acfa9372e9651ed2037fd9fb5bdfb9d09ef7f87aceacd3e802b3ca058282ee82c59a4d26e5f7fbab7756b7bb681371d498b82d9970186"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "25b81dad69c1665116f2de6801c7acb3353e25d4d72a2edebb766119482038bb378c3e15cc9d24d7b3719912067dc4646ba814b75da2f5a702902ffa73fca32a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "043aa96de8257c490c7837250de922934ea465c6b7cc0a313da21c2b4a0fea337e3b3b1d76e027fd3174f66781a9c7503b5e8e36912673fd822615da1da7720c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ad136f59248c3496c5790e721433d743b5d7b52c6b83f89b7adba0bee2c70a2569e39afc2f32d2be0305c3f44ceb8c75b8fb2da980a98eec201a23297abb4ec4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "38f41c7b2aad097bd8eb6542793382c039ea84d0c6eb8835b9f26f3dd6f71b0d9b35ae2e56beecbbe52e9f3908727f66138beae020f6dd2b5b3ae1aa026bbb6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b8ac56113b49e063898f22e164f0408501ff6836fac7e2319c1dfb9714e0ee409c403a30fdf33a530a53ab5150f54c4a759134238865e92d15208a7f0eea47a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "e2be4dfce210c00f61bd4f84f0500e7f5288e35c9683c5320777dafe6120009acd9018f4cc9071cda7261ca3e2a9008c3ee5f77278a874caf2545b5fedb85d47"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e183da3b542bbc848518df674f53f8023055299f47a4b5c6519431a2ad2db12deb156d239f8feb48603f39fbd7964aed8d5eac7ae74f08b8915625a187c11d3d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e3a98a8f0e1191cefa214161c2365066b82bd77d205206d7284d63572f54a2d60980de1054a3f4cd53be138e2237eae3ffe313dde5c8bfb2b1a24c4753416593"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "11211f37217e1a531786240258676207b061c0ae5569e548dfff185aeda10646954bd3af5ad18795e7c90c640b9a7159130d8ca52bce6b83c4b2333984bc7ccb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "790d6cad2823ee3bdf977854013510e45f738c3fe08ed468caabf2a9b523a8678b35c69d4cfab081e38cc9bf3068a2db800d3c475bb9fc590e357bf62db8096d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "6a75467766b47156d767068890254e4c14652fe9cf0c70165828162d9d8aba7080694467b6c0bf2cbbe8bd625f89404f5c56ffb3558d894230fbee62d17b7040"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "9180a50aab3df40cba5706acb9630aec80fa54a7ba4326ba690cf8d6a84783fb233525477fe59e373f336f79b10289dadd14166cb1c6274b3655265aef2d3f9e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "694f7f12b9de658e449b08112c2afb1695926957170394d722c4c44a1b4e1e3e909ac936e1223f0913c1fe88d500adc88fad785bd8954afbe9b5903073666c1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "36548e75ed1a538eb84dc6878bcc5c3d04a6303c48fb419159539560b2c35abaa2fcb7c77630afb02416076dc32246aef5c4366c4711148e06f6fe09471be353"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "2b5eb631d823ff0a61e0662d50413adaa92dd4aa08aef86f8c3581397565f5305b4055aeeea9398d12be40ebe5ad16098c64392733f5c0cef3cc242129afb6c3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9f0e88b63156fe961a7d2a1ab8ffa88f35243231ac4e812fa5949ac3e8ed4341a41a9891c21cb225a72ffed86824ee925510b13bb3873c019bdf25f972cb7625"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "2dfc608eebe30a740c4550ce9a467d4aabf358e0aef23fc01a19d8b2638531f5736879e317ac09e19926d708c67a584ab5507c6eb503fd0b8833f51da9a630f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a7537d803fa199e49501b0fae17a6461e71452eb0244780166de59a7991e21ea2c09a68b53d338e507bbf7031b460c9ba5d051733ba5b8c6c01db9168916e7ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "75fb452b696aaa68bd541042dfb5c5a4b360478dc4d5d0a3ee938825b0ba1eae0e99d1a42a2dc558a4425a9c5ae9add92e96fc71de1a3a41d6390e7d06050fed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "c4868931765948352117bb50e685f3694209eb04b6ebddf20528777caff57a4145e19e649e9220d590c2f9b1fec3664a5dbde5f0ba3ea063cea0902f49c7c3b0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "942e8fc6f19c307cd3d403cd545dec8355f045b3a83d469632af7f2150d76bf2b33d61027c34166a86bcce0bab35a1d5b431b96e18c951307dbe947ba95e902c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7e8b2872b63d25a6ec8789fea550ff86e607e1d01c44c9ae20ac05fb4d305e497491d27a35478b975daa034a631b87b11c510ff5216ffb0a3999cb0feff07b0c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "0f53d538665e46f89a3bf3c480f6ba8b74e648c3539680d0a033a21e9d5cdfee578dbeffcb5e445e36511928e31c5c9419e3843db5a02afdcb365c116d467986"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c464681fa140659fb6dc071074279fdde8156bacde02d0a5f91570feeba6b504163b6551f2f4930b1b8be5fdd89b81956f720f80cb98aba6a9db5d47e287855e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "deb26dc8560aa7cbfae2d23bc2fe8a7fe9ab417a7c6eb90bfe8229fa0231edf22c5ecebc8d63eac0fd183b4a17e5403998bc44c4ef78632f89e38b49b908f438"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "418d5e1f87cae02f2155a5f97b17242b8f7589b146475bfdccd5ab5a6d5d37719f008550357b289e353e4ae940cfb2c61229df3aa8f91c318497b668bde0e069"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "cd65efea75a85ac5e30103335a747449c23b5bfa8e1b476540c6cf4bf46596565c74c1e86b3494f0d9e197ba284cb813df63d7809f7edaf709ad9dce7c272b25"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "daddb4ab22650b3c69b09eff9634bd90a0b8e623309b944daced02eae82459405cd47ac5fc0d00a03dd84ef9953efd9aeac21a73a72a5441ad85444c1e1cf93c"; } ]; } From c97fda0bcf925426a6d57d300deca4da2feedaa2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:10:06 -0500 Subject: [PATCH 159/219] Revert "icu: patch for multiple CVEs" This reverts commit 892a9b1f0faf9553234784f5569a883c6f4f34ce. --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +--------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index a2465ce930f..cd4398b3cc0 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,3 +9,4 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) + diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d4a4c2a500c..ba8fe038ffa 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,38 +25,6 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; - # This pre/postPatch shenanigans is to handle that the patches expect - # to be outside of `source`. - prePatch = '' - pushd .. - ''; - postPatch = '' - popd - ''; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; - sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; - sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; - sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; - sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; - sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; - }) - ]; - preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From 5f4b3cd34b2f49a3ad26a76c4958451a496d2e0d Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Dec 2016 09:08:39 +0900 Subject: [PATCH 160/219] thunderbird-bin: 45.5.0 -> 45.5.1 Critical security fix. https://www.mozilla.org/en-US/thunderbird/45.5.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2016-92/ --- .../mailreaders/thunderbird-bin/sources.nix | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 967ae7914e9..8f74fd2f53b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.5.0"; + version = "45.5.1"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "bd6c633bd3ac5fc26f98ba1183f51b4380826d40762b1a28aa2fb6cda2ae776e3dc7909024d7f66b771323d489510c5237977e1380f33e5ac6ece933336e75c5"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "bfe82d658ce9950bde473836f2cfcc1319d22939a5fad3804808258faee4e96b0cb208ba386c102e41633137c19d071da3868868ccda8155d2ee02d71c05b132"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "99870cc67812e321dd2338f68612b63a31803065021fcec02b205f45f9cf263ef535421c249ba4a6a7205979679436a746300902b5c716ec333de0b9769d4f47"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "911ea7a1852bd61695058f68ae2ad991fd10107d876cf95b95f7df4b42ffe45a787aeee9241e1824281dbd3b1e32d8d815369f674bcaa21ad9268fc2f104a646"; } - { locale = "be"; arch = "linux-i686"; sha512 = "3faa1393235b24a73e04be481601552acd28620807a64129061a4fee18d42022e7765a510b61d17193066feeb99a8f3ca2fac405056f66a401c35f23791c8f83"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "d2118deecf5ff12d6e9b2807ff3129bd33e3d8d24ef0db067b031894c266636c103efe8e1d0103f41eaf2e1ae6edfa51bbac11973c082a1ad2339c992e7fd856"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "2123fc69d26ed28c6f4a2a8e6ffa3294e594e87608f9c7da3f4a811e39e58e59e1a50af616a6df810f3c8e0872eabcfc4708c4590530d780a52a2200e4a321c3"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "bf11f9106525f5e02ee26b89560136a07e142aced7abb3b7d9d7578e413ce24abc20995afe054ce32d3d9b6e4fb68a254bbf6a268658c908b33e2da26efdec03"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "1823ada3babc79e5d38f1012723c3c7eab2f885a7159d3b6b9d54573fb8c8d849799aebf60a66914cb545095894402cae6acf4b49e99d77e3b1a49b5418c04c7"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "737d2557dade96501f4442001a803eafb5c872967850cc875b902acb17b1133fdf0d0248271ff225babb29b937d744ed3294e4e73e82fef96d07a63fab80ba92"; } - { locale = "br"; arch = "linux-i686"; sha512 = "8e4377c42db9535a708a18d0b4d251d0bc14da24bf8cbf5fcb318d77f4a90e26f535f46642c9b940b3ee8887fdfeb218aaa9f846dd3b9cf89ce9d4e6035518af"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "4720d43ca4bdb2d809b4ed36352c03f05c823485951aee8943c24952aa493ed570c4eaecd83920c6ebc112d71e6afddb7b2851ee5a72faf3b4536fd23b35678e"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "94132e06f04bdd7928090944d3ae65440e15d15ec1f690d157809d5c524b071ea3c0f3f12b6b6987becdbcb33324d7471fd23feffd3f4f136e9f485b5dfc964d"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "84e4e65bdab737a8f5663dbcc1116b55a8ef88d9401f30a6a8acbff156913aade12d7b0aa61d9678811032b2e3a905d50ecaf0c9a9653500034e2f90f8ccc510"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "a51b94013fe020edc5b3f75f950fd6bb626c8ad18c73e8884ced1d74feaa97d899482e213639bb26496cada97cfbf4024380c49a45547b9e65c033f8ec09c2f2"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "50214c46072d17c30f19f0ce8a15a68a20839b5f985ce3a4c995c9739fc1290ca2d40601b7349c2af2214aef3207fcfda2a9115dfcef9ee1b005523b23a22317"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "a528980e1ca863c47d8b8a8e5b5891916d3de78bd20c1236b9d1954d0f057fb2c247b303eeb8643b6be0fac46a1c665da487c9a5b57f974066a5e3007df92123"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "fb3b1f14d55d32afcd22f3fa57736fcd820dbf06e6a92b72b8b1ca2f33df9156a0ffd8d0ada11bc86e11359add9d5c225aa07f4b1321464486cd75ca276594dd"; } - { locale = "da"; arch = "linux-i686"; sha512 = "1519def46f7b154a517344fff1ec076b5288cde722aeffa683dc3f990434fab4558b63d8062306c5a68d1efd3e30c983f3deced50043fac24c256f7b58542498"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "c5c0e24a0359a0ab178c369d3fcc7bfdf15411088033646d4e699f6e2e3ca8bc8a4719f8c214442661dcdc34e5e1f577dddbda40363cb9824fc9e378ff2444e6"; } - { locale = "de"; arch = "linux-i686"; sha512 = "83f7bc92338a30ed183dc9ee67d94e02dd8c659b8a711adad023f79a6253530cb6f530a4f31ad90796cb78566f2e280cf4ee19060b59323c22ed9bc678bee85f"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "6163afd45c2730e8970eddd8f5c159d4a0b4c48684fd6900a0b61eff1ba683a320a6ead6cd0052f0b9cb04f7a54f8e6b633c2bf6a594ed9c94afd7fa742e9061"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "9772c7bbcb2ffd475aba6c00dd527defcc7d2618e6537029abb49a47038c0c16b32f1c35ca4acad2ec53a7e5265598b0a32bad615281cc96afec819eaac32d9c"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "99a29d265454eeeac1f80e91913fdf4c6ec850532dea4a3891d0c0ab0a68e5391b9fb42640269c95214131c63e37e4ff7a2b6ea93c609e7b1ea02a04cabb0749"; } - { locale = "el"; arch = "linux-i686"; sha512 = "b6878a4ef1b32ac0390feffe6da0dc2c5c88e0bb6c88505e653a630eaa47432be1bd2903d97bed855c41dbbd5f5babf7b0b747b8afdc0675ed670c6bf5a69649"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "a11f653ef20c76187c9a794b70d876f9b2244c5bf9a10a9f7b41969bf35d36b1d75b319bab6cb9b29616546d68be4b587c47e9f54e8cb93f861f1bbfb9c2c1bd"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "88f1754d40cabbd473dcd5a24a7a91f7bd625b83b91223eafe78271409720ac9d4cfcf32711f36f72cb8b3269275d950ec55d2f11377880b8fddedd2cb04348b"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b754899626a8bc0fa7e491e6d18b84e8900266cbd39ab619e8a9821825614a46c6bf42ea490e56a8d25b5467e5e9280936f5a5034e055bfe736140f4bb9c1ce3"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "a66a92dbc8c2093d7498934c5f8d5a0e68ec3649b74d60d98775e33832902796667f2c06b2001faf07a535de18b6a2cca6f61dac4f8e8173040cdc9eeebbac88"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "4d5c6ce9f3e2a6fa9c44d6b8bc2cc50a2c129037f9a16833cc767efa379c2c2db27b2576c7a8cf93e87646244839614577230161f1bc813755f8fc43ffbafc7b"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "317865e753dcf03cbb0acaf67e0a34843e6f3264322e2fe63a1eec916bec07678026e6be4f7ce49626bef945a6f34125f28077ab367f954d11ba6f082014b4e5"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfd16a5ec21a1ca13fb5e882a75a767da1387c5f4adbeb3a9f608f0035ba60003650e6d3be57b2af8efba2d0bb8ed94ac879ad5f5e2039fddc6d9228f8ae0336"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "7017c9da2dbeb468c2ff3ebba91c2e83a6a233940296fd5bb03b4d1e5531fae189240f630055ab2d6324a0dcece5d2e80d32d7d9ab17a81709985325d5fe505a"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "920dd641893de2e7b7692af104402e9898c3b8e3311960b5f3072cba07e0f8f918932be591cec92ca3a3aa9be6f17d605c55be5d2445864cc8ae025cef83dac2"; } - { locale = "et"; arch = "linux-i686"; sha512 = "0a24d1680b27a1e79985b9f124bc3742f2d4ecaaf2d4742db9ee1f9841d1d4b7d08ba60e71baf50ec6c593bd1a8f51d768a22b364e681b8c8a3651e37735f5f5"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "5c56cff2cd868985800c95eecffce5fc8d18def49b2c553b5c26decb364ce087d74220b2db78bb4c88c18a06eee4c5d0f3e49f17e54b67bce81083da465b53f7"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "c903ccbcadb68d951442051e558ab657c337713207887c32383902cf82a32cfb04a60ce03a5cc02fc2cd9542ded108beb433eb32270fceb25e8dc29135d2f4ba"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "9b782390d45dea01944c1ae29350cf01ee4bbab6ee94d00549aea195e4731b0c410b96f5101c44013352e8323f0baf27bd076a017456f6cc7a221c505fc7883f"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "5b33f4d58604138ffc098e9f3e4284f11ec97e58d0586cfcfb89c0114c61b07c2e1ba0051c5751101838d3a1125fd0dd81ca818d59e967dcc7a6cb166c01b27e"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "41ffde0d385bb3f7d271b11e470614e63f3e25e718f5f0eaca383794543c45a067989f7e153c4d48ec59199d2209e1394f89a14f4b776a0a8d1dc58466f91a80"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "2c1e6151f256b4e7b934830c84edd0faa942ad49ee7ee29b767bb75182f296a6a24bc5cd00e9649c78ec649c879fc4c0030d1a73a68b215e72132d0149361b89"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "ba12fc325112ac1076a9dbb56db5c9b7c03ba67e196d90529cabc3499ea5f479c5ad4cf3360bc891dad8c76a9cf846e1bc99f775d7ad83c45215261731530e13"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "0588462a5b0777f77dfde87be365beb5864e4a89b11cb869b18b47d2a600fb25287ac01a9e0b74156c0d35cf9e05e14815b3395a9fcb19030300ec74c3697931"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "2333728d503d8d171009258f6b59f41c20175e3ffde9ab65da3199825901e1c10adbab7d83eed5485608203d8e985ba9fae392971a11070b9fa3ab8a257cc28c"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "f43b95950532e23d1ed3a45c309d1e6dd5d79b56ef4b06a44a02485a58aa306a810360349ff2dbb617709785c4633ec3c79ab930752d112e9f971ba2244882b6"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4fc095fe246ca02ddba8f005ab95dc77b41ed766fff1b0d947f78db1e3fb09a1454d1f3f83b3160127e985a3256d630176f7e6076b4eb936d2529b5f86d1018b"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "72e6c4b9e7afd114690f5416d4018eb72ccdd4f2e71e60328e4df92a4043c19bb1ef917661abb8476fe68068754b17b18f7b8178494ad7f7278568919123f495"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "dcd069d8c4b2d096a01b2f24dd4acd60dbedc1b8511d1fa4346be9342b99b81b6252032470733385e70dfadf9cc755c1f4878542d275a17740290a35dabf6285"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "f1e9d759fe8fe2d613bc640d519a73ce843776ab6f7511734522a8728bae07762705b1698a0526accdf9c0c3a9bd233649a01931af2a653d17ae368399df0a1a"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "16953e45d9c3618c394e4150c58ca7fca45d90beab9a2253ee6cfe58a85e66aa2c5788fc4988c38b1c70470dc3fb9bb96a09daa354c88160d53739ce95ea25c7"; } - { locale = "he"; arch = "linux-i686"; sha512 = "89a6e7a06694e55128fa584cb6fac0c459d21c6f795caf581532b7ce69e0ba1954029667d5d3afb5835ffad1bc0d7444ab0c59cff2873870aad6bb232ede542a"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "183ce0c71d7852490f1f78d8a6380c7909f4462d238ecb342e35a8fe5b369161b9399c704011a0741bf0694b67713f93ec187331c414a72e0d77202382a99c7f"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "03c6d917c230cb9075958a6317599efcdecba5d8623a2664342bdc3c450662be64d69c7136c4f7ee6c10b4c7cdad8ea5a19cff2862f1e8aed9e3df3687abe182"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "b26d084369b30bd33011b9761b16769795e529575174f5533174bf7fd71ac387708942cb3e709398bd401341c7ca59486e203865adea58e89743520f0557d94a"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "06dfe62b99b8a52d0d2835c83e9becdd3af3b278e1fc8f7985f2d3883c25ff2e65d55a841c1040816d64faf4115f867c1c18a771e6139ea40fe770cc4dc137f5"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e303bfc9ce30479d1d79611d29dc95cbdd3ea4a6abdd1df6961cc7e4d832c6b44f6010f5a7e74485b4648e781aae2cfd2da78bbae6ef09e0cac6e5b980abfdc4"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "f454805664f2aa7262449acb74d78fba411e5de175076a50758f149fc4c1b4f5c76f2a36b253acc18bcc809172db3fea17c6cba524918dd80f2b17bad97e237a"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "0e8a0a2eefacd575fc52e6a761be481b1a4fe29eab0aaf8d51e2aa624f4cf1f5fae2cc9dfa1f68af83b82813cb8cdb8da3e454711f611a621cc22b33acc44e98"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "3ed1482d68759f143f403c935af3412ab819b6801e13bcaf123ef910db0bbe2c7523b52f1dc5c4a93b1a087f3d78162f2b8c04930abe89abf9536abcea374dc8"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bb43898b0953dbde2837906da9edeb0924a65488715d8e3cf22698ddf665a8037ec758ed6df4ca04ff2f04df437eb8c71d98496147bd5f92b22246bf967be769"; } - { locale = "id"; arch = "linux-i686"; sha512 = "c2800b997e412cfabd39d7c8412c02817121383ae477cade3db1d75f7be47091b84179e54e3bd968ca79c41199fbc1f5ece63cb2b9eef038e9af6e4034326db0"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "b5cddfb6c6e8a6fccf6ef4ccd78734e766c081ae5fe3d2a3ad73852d453fdd71eda917eb29ec3bbd2398c7c810c0e61195680de1cded8f4394322a12ce84e0f7"; } - { locale = "is"; arch = "linux-i686"; sha512 = "9ab50f7d7ea5450bfd984ef180eeef8672e21e5d1610def3f3725589740ce57486985706713bb292a1a577dae1f9b6106c568fb2acc11f4bb92c1801af444c8f"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "39b6c5ae33b191334d0867d031b59b06a86311527f19b1fa8f0bbe0dfbf90f4f2cf952b8d6ed22851828b16aa3019a8208e6f7b603a6d94741ba66111af00955"; } - { locale = "it"; arch = "linux-i686"; sha512 = "13899d6940dd4840566def16ad5d36b6c992349d68bc4d9dbb9c9b73bf53310401e687bf9a4b9837205f5a527f3b7ba1270bb4e4ebb46c129496d49b0b19f2e5"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "c1434939ff690a4036271c013f926230c7e612a64e41aad6e0885109eb5767fa0639286fd44e370f24cae1d4e70a72be8bb04f5533c66c7fb52ac0d1986a767e"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "7b6464fd5fc2b0c0a54f760df62c9f08c94662d00e98d9d7a58844d189c765d780798a64079507aa84532e91b28a92e4d6f21c51bd9abf8263e8c4267ba2f9b2"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "3545594699f209bc78353b3f4b17df5b31f1283e826937cbbd83f34a32aee658c67dffe4cc77a7ea055f09e6d966768715deb7037372d29796a1fddab89383ca"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "df238479c6d58be8986a1ea581e63dd7e42a0c6d4a8fe2b3ef66ceeee34c68a4b02f689844e0a19d59d65abb175cbd95387a4e2d0041e7b126cf7728badaa0df"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "e05d44fc6a66c79ca50cc2bfd88d39112783ed636370ea2927cc2202c8b5829f05aa1e6fd9083c4c5a37c8bb873aadc5aa81d0522abed5742fe78ea3258f8e15"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "219d2030e11fdfe5f68f703e6141038177257025b5f1039776cc9093c35b9ac03d197488ceb960d1b2b5c9abc12ac2b4895990afbd430170499d3639476eff5d"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "6221204aad7b62fd540a5776ac67ca968c5f7f436d260664184c871f8ecdccac6542f306c2d34ba8b74c17b15caf549ad30852fd003b711572ea3eba0c2a32bc"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "54b3db811b3573cf0084cd5a5df45e33c6540b1d6df301023853b1fb023f786e70b9f6d2b827273504e70809096d392b0fb91ff89ad363c051ddbfbb6dcf8099"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8ccafab65ece0dbc9d7ea7067846d3a45df6b4a78d543d54f87a52f359a759dd4d3f0272ca3ce8c792feb643c5d3871ed411d0b8719527969acc1cde39577768"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "4ac1dddb4f65c05306738fdfff6b939e4678a59282519a053ae3b919e2c9d0cd4f72f93f6c5925efad101c64a32ec10187fce6734dbdb8002ed05bb1690d8cc0"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "58555fc9e43b9599486b25fdf8b0e4e27a0592f52db730123ea0513be255f026a35a2d9ac9be84be158e94c3f95fa5ce9dc531dc94bc839e36092ce6ad560b6e"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "102ff8f498c9acd7fec58973bde3807f2821723a223ac7646985faf1342eeba15b438b57a6c1e64005ebd86b97cd37555ab568ed96c228ca825651e9133c2696"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "eeda11d9e76e713a287130e1c0cfbc8507c0a148061dab878891af0c7751fb517a0f9d3d49c31ae69514e5caafb212c5e23b6254dc310b63c2f241741c8edf29"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "94dcd33d5a992ffd7a47114555d1a12d31e235eec60fa6792fe041154c27dd0d97bf55d0c8bff763502d07a9b458402322a54b0b1943ef7a55457d32360135f7"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e7a5fd70e80c34c12650fc85af282dffce6fdcaa95c177e18930212605510858d4f71fe0600bccde80aa59bd81f22b4425830fc4c0c689c636105512fb55b0fe"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "a056b9ddf6a2a04adf786bad7cecf4d4c02c0ddf8584ef602e390a2157073a654473f2262a4e418fb31ac0a198fd212ac67a2c9e9e52490b3d4236fc6c73edb6"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "081cbbc49b12223e9a9f860fc6072ceb855634419bbb4d1e2923342c7f4f0b634443a0c1f9f60bf8622b9176412c4216d555d7d075bdc120d0c4bd2d809201db"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "22b4194129af89e81e1fa7ab38c2905169ca73c8656c6a7b718cf4013dbc0bcc4336ef68303506894e871487092f8ae7b2a05f914242dd2ea61109e3f969476a"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c6a5556ceb64c4559e1ce92019312a9b862efe6e5c93380859f8e2787b54cc5e12796446d7effd3bf8c47704e6fadfd80da9261d30c1ab666ebb7a34ac15c525"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "46c292e1daa7755332f29e2e6e785013badb3bd869d497cd8fd85c107e9412bfac9ffe1e14f99addaac3d413e9ac7dcb2ee4ba4dc5dddaeee0fefddf0256e281"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8c1e72eea7b4d30ffc6e5915d51289abce564674231f80ac0e5e03a45cc971683232ba08893672e424fa1bca75ebcc2847d18f044e2762c16f0d955f56895140"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "0b3305f2c7d2626d2fe57484c694e5400f6d60dcfb62e65ca925501dc1c1ba3a9ab3f71f2d5584a5d6b49567aedd7188582967f0ad6e7a461034e50cfb577d32"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "6c875b6806dda0ef2b140ae3a3bb47ae6f5b93a0b6d7b9b2d0e2182b6f3f356c85cbe60c9c79bac51f46a2c1adb59f240f7d1c45be203b38a25832be178cc0a9"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "6043a890614495cf28a1271716e6add0229f8d5ed911fe04152503a20a26e7b4da03475e4a1c08b93cf512bde19916ca1a53d41094ffa8a2d48e4cbc71fcbc33"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "9a5a81fd713ffde8e38aa9ed7557a9a8b6b902e8ba316e5bcd5c4af2f73a1fe67a226a9401ddabdf76086af6c8432d00d02cbafc250f03190878deca1bd69588"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "aa205e2f3bc4a4e22520a41c9ba516f6360e062da74a180221b5236cf10d0a30e1ce3b5eec1081a8a9b4de3331fa3f289dfccc0b6785363b3411f77d8832f7c0"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "7c8d7402949f34cbf9ba3eb32fe1fa1c225296bd179854a199968f012c64fa3a016dcaa922d0dc0abbe1fb0bae438030f7096aaf79be2c7822df2f529e1fa46a"; } - { locale = "si"; arch = "linux-i686"; sha512 = "841897e3a07a0a6dbb4e912e424ea52b17631549176995e3c8ab1581bbc4e565be084ffd686ae6a4596224a642213477d40a5b2aa702ac6679e1ae71bdd88516"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "618b49c54e2057c10e3ea5441e2e960e4581589fc2685ca2f42cb1cfb5defd9f26e60d3f7af603757aaf73021133a0bab94ddf3c0cded1442523a55661395720"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "e00c42e2adf10e9d19d434bf67be2ff75f47ba11fb2a5d00d62f9946c3c274795fe2fa83b718cf21cc4ac396f10212ab459c81fa7d866ff6a9af8754b0663db0"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "48a0277c6082e84dc51df64c9e726843d1361edee39e27e625f09cecd56c7b82e31d31e121799f34da4e85177506af680dc893b8f305d24ae7f6276146842120"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "585fbe3e399d857ff21307a0ed53c5ea9aabb68232da44febd3c52297e7f9636f6aab6c8f698e2714a83632c48b4b60933568d6dcead5a614fbdc4b90be416c6"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "e84ff51b3feb54408e6abaddaf23bddab85d6a3cf78286dcc13da43e743306addcd2dd6fd58419d2e5dfe2e5d63c0ba51810fdd9ec080427d26ab8ec7535eba6"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "9ca817ada82c6f2199b0c357164fc28b98351c69a8cbfd98048eee407ddc05dc90714e7dfca4059a55ce2bcbc133ae22c8f26a8bd632d60b7bb561221d4fcc81"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "707088e8fd72c8bf598108f57d684369ff5b1c996e39c88a002f724324b111b2d7c00cfb649eddedbd70dd0df22d10f2f83f9114a71031f33e9adc250a193402"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "243baec5e5daca6cc7410bc3079db3e5201b49f7ea1b76bfdc84fcdfc50c3327e886ce7e008c9350c7bf5128f61c34ae543200bc11ae0d3cfa9166a3000b243d"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "212ce66af4689db19b234b463b0f29b01c7ceebf1d4c67a10351f06f2e71b32d050e5232fe0e61e15fa30a852107ca7a1fd80475fac7d2b877074de3b40e6bdc"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "31637fef31f0e1d08ea528bd7b917c6d67ab047c3d1856fd60b8a1de20afec567aed093e27c938aee4c8b1b4269cda5f43a127cc3284deb3db4f0d98a8d23a8a"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "81b745a763fcf3b60b84ddae56cf59e363269986734f26275ad3e32320b8d5ac1a4a714a03861ccd0fdae499767a93b53f5717ca78074c79ca2c9b303406a5ec"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "c35956a5aacdbb2eec20feb41fac23349c621624ccc792c9f6e711935c45afaced43e8c75d00c4c59d0279d62d5092798c3200d25730a1fa15ad03682b5f0d86"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "5bfeaf3ec0ad5ae56b540337b72795e11fe66846df72ec849b51db32091df8ea8a9ba4b2e6c46f2cca2f672419c6ca6fe23de8c7668edce53c38c5587b83c075"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "b617860d43de6c1f191ec0a021b86e49217310fb8aaf1ce5d8be11eb27e77f6cf7338f8e675dd25a53c298b4fc7e5228c289aff86b23b81c8176ac55953ddc03"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "f421c0889af9229e7081bb9f4f5a6cced6647bb230b7dd5d14f46bc5a0ba4c36f7a711e9b9df446ee69e165953d1405c1b11c9912447194518bf9c9b58a5da53"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "f33c519ea5fb12e5f98cab4d3de4bc23e8277db9534b765820f8cbe1c24d6d33a033b0ec357f8b13d9d16915f6d677b5b206cdceac86b9f8a09aa1d9e016a510"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "1964f6597ba11f10010275f7ff256f8fb86bcafc426c81c4f2d55f5202b0d19bc978a1be24e2b204612bf19097afb0709f00de263fc34dbd43eb6b331f85b9ef"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "4ca3d166fdfa02bdf8581bbe29b1d067011d4922b5308af369407da7e7a00239b75da739f4be88a158e29b939516095101cc03602545900f87d91455ad716c0e"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "5e335a87ee0d5ec63e45c2570f628d0ca1cd5577b39f7469aef2367632c10df16525bfffe2a4f80f473d7faacf9e96986130e6548978d9b4f606de3a25a12cc0"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "de86ee26774483a31e74a9f89e144d5bb4eb5493f27cb1b5a21902b8e8cdc0322f15d38498b8d6005b59296715b9d9125676b26661433e280a2f1807fedc3df3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "291074caef4a1a1162d0c3f90e630985978ddd731fde7d9d1d576c065ee8b89af5cd10196c4b05c537996ab99d00d78119af00bd1cd77e85b567303c38d1e792"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "6873ff342439247d5bda3e3065998b33bdf03f1d80d15a2f733a79eb7ede188a71e628ec3af6a67354f9adab9f67d79a86310060b20de09c623c342e3b894f2b"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c60f4ef8b1dd22db617e8d6381f2e0ebd37fd8503c363548b5affda704d483432369138943f84ca07c89a15dcf72b9a081f8db6f1c202558050ec997b9389ecd"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d"; } + { locale = "be"; arch = "linux-i686"; sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3"; } + { locale = "br"; arch = "linux-i686"; sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795"; } + { locale = "da"; arch = "linux-i686"; sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760"; } + { locale = "de"; arch = "linux-i686"; sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8"; } + { locale = "el"; arch = "linux-i686"; sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531"; } + { locale = "et"; arch = "linux-i686"; sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c"; } + { locale = "he"; arch = "linux-i686"; sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de"; } + { locale = "id"; arch = "linux-i686"; sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c"; } + { locale = "is"; arch = "linux-i686"; sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335"; } + { locale = "it"; arch = "linux-i686"; sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8"; } + { locale = "si"; arch = "linux-i686"; sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f"; } ]; } From 7e40e89273df9ed15dc563401cd7c1343bcd0188 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:18:08 -0500 Subject: [PATCH 161/219] rpcbind: patch for CVE-2015-7236 --- pkgs/servers/rpcbind/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index ba2e1447ffe..744763c43f1 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, libtirpc +{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: let version = "0.2.3"; in stdenv.mkDerivation rec { name = "rpcbind-${version}"; - + src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; @@ -13,6 +13,10 @@ in stdenv.mkDerivation rec { patches = [ ./sunrpc.patch ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch"; + sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq"; + }) ]; buildInputs = [ libtirpc ] From 16995fc57bbf0147b4b43d467f03dfeb4cb877a7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:19:25 -0500 Subject: [PATCH 162/219] boehmgc: 7.2f -> 7.2g --- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b0eec4e130b..fb1f177d969 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, enableLargeConfig ? false }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2f"; + name = "boehm-gc-7.2g"; src = fetchurl { - url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; - sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; + url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz; + sha256 = "0bvw6cc555qg5b7dgcqy3ryiw0wir79dqy0glff3hjmyy7i2jkjq"; }; patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; From ea07ad6bd9e3144248864a21b4999f32b78c2857 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:29:51 -0500 Subject: [PATCH 163/219] Revert "Revert "icu: patch for multiple CVEs"" icu: patch for multiple CVEs - CVE-2014-6585 - CVE-2015-4760 - CVE-2016-0494 - CVE-2016-6293 - CVE-2016-7415 --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index cd4398b3cc0..a2465ce930f 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,4 +9,3 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ba8fe038ffa..d4a4c2a500c 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,6 +25,38 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; + # This pre/postPatch shenanigans is to handle that the patches expect + # to be outside of `source`. + prePatch = '' + pushd .. + ''; + postPatch = '' + popd + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; + sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; + sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; + sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; + sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; + sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; + }) + ]; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From 390f6a985bea5183e9e15d9dfe17e61aac86dd00 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:30:52 -0500 Subject: [PATCH 164/219] Revert "Revert "bzip2: patch for CVE-2016-3189"" This reverts commit 6393ca650eb9ef5f045905600c4256a0d0bf20b7. --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ++++++++++++ pkgs/tools/compression/bzip2/default.nix | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch new file mode 100644 index 00000000000..eff324b3250 --- /dev/null +++ b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch @@ -0,0 +1,12 @@ +diff --git a/bzip2recover.c b/bzip2recover.c +index f9de049..252c1b7 100644 +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index cabd412fe65..51f47811065 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,10 +20,16 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; + patches = [ + ./CVE-2016-3189.patch + ]; + + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From a0f05feddffbfc3f399a324dfb167cdc25f74c94 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 07:59:55 +0100 Subject: [PATCH 165/219] gtk3: 3.22.1 -> 3.22.4 Fixes #19945. --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 9882cd7692c..b50264f3a02 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "1"; + ver_min = "4"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"; + sha256 = "0zrq3wq4x0vcrzapps0608d5ywcrwk9xb2rmg32h2g8kzvyad53h"; }; outputs = [ "out" "dev" ]; From fe63e45c08d13a73ce3a94a5f94c43c771017c45 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:33:39 +0100 Subject: [PATCH 166/219] grafana: 3.1.1 -> 4.0.0 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index de9f75b87cc..821d049c297 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "3.1.1"; - ts = "1470047149"; + version = "4.0.0"; + ts = "1480439068"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "066qypjl9i0yl9jgqxh2fk6m4scrf84sfdl7b1jxgyq3c7zdzyvk"; + sha256 = "0ps9bi4mnb3k6g2824crhyb804srk2b4d2j9k306vg0cizirn75c"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "0zywijk9lg7pzql28r8vswyjixkljfjznbqy7lp5wlq1mmihmxr0"; + sha256 = "10n3vmmyr1rvq29r5cz1rwz60smavj6fahz4vaqldh1v0qyqzjlm"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From ca46d05f18666442b7160d17d58851ee3df31479 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:34:06 +0100 Subject: [PATCH 167/219] prometheus: 1.3.1 -> 1.4.1 --- pkgs/servers/monitoring/prometheus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 7f66aef9d11..a5fc6e4d94e 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prometheus-${version}"; - version = "1.3.1"; + version = "1.4.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi"; + sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm"; }; docheck = true; From 741bdeea389aae88f1120ed46ed4a8f51ba69b27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:33:51 +0100 Subject: [PATCH 168/219] prometheus-alertmanager: 0.5.0 -> 0.5.1 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index fcdc4beb3c3..8bf9eef6cd0 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.5.0"; + version = "0.5.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh"; + sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq"; }; # Tests exist, but seem to clash with the firewall. @@ -31,7 +31,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From 96137a6abd831ebbb6f87f8a9af6863654f84ec0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:34:21 +0100 Subject: [PATCH 169/219] prometheus-node-exporter: 0.12.0 -> 0.13.0 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 161b56c1d2d..1115ca85f23 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.12.0"; - rev = version; + version = "0.13.0"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0ih8w9ji0fw1smsi45jgvrpqfzm3f5bvk9q3nwrl0my5xkksnr8g"; + sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q"; }; # FIXME: megacli test fails @@ -21,7 +21,7 @@ buildGoPackage rec { description = "Prometheus exporter for machine metrics"; homepage = https://github.com/prometheus/node_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From ad5486689648e84b7f1317dec14b455e5628c148 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:37:37 +0100 Subject: [PATCH 170/219] prometheus-collectd-exporter: extra deps not necessary --- .../prometheus/collectd-exporter.nix | 4 +- .../prometheus/collectd-exporter_deps.nix | 65 ------------------- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 6c703e5fa7b..2bd9b6af074 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -14,13 +14,11 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.nix; - meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; homepage = https://github.com/prometheus/collectd_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix deleted file mode 100644 index 92523d69937..00000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] From b24b6bbfb0efe9928c68aa98c1b7ddf5e1a792e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:38:03 +0100 Subject: [PATCH 171/219] prometheus-blackbox-exporter: init at 0.3.0 --- .../prometheus/blackbox-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix new file mode 100644 index 00000000000..00292afb8ce --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "blackbox_exporter-${version}"; + version = "0.3.0"; + rev = version; + + goPackagePath = "github.com/prometheus/blackbox_exporter"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "prometheus"; + repo = "blackbox_exporter"; + sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m"; + }; + + meta = with stdenv.lib; { + description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; + homepage = https://github.com/prometheus/blackbox_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ globin fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9a1f1eb12..e45c01bd821 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10359,6 +10359,7 @@ in prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; From 30d974e68bd37dd099dc49843c078a0f115e9487 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:41:36 +0100 Subject: [PATCH 172/219] prometheus-haproxy-exporter: 0.7.0 -> 0.7.1 --- .../prometheus/haproxy-exporter.nix | 12 ++-- .../prometheus/haproxy-exporter_deps.nix | 65 ------------------- 2 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index ec63d5e6352..3a61480aea5 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "haproxy_exporter-${version}"; - version = "0.7.0"; - rev = version; + version = "0.7.1"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/haproxy_exporter"; @@ -11,16 +11,14 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; + sha256 = "1svwa1cw4yc5k8acj2r2hkall9csxjw51hgmwkmx5dq55gr9lzai"; }; - goDeps = ./haproxy-exporter_deps.nix; - meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = https://github.com/prometheus/haproxy_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix deleted file mode 100644 index 92523d69937..00000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] From a07912203eadc22fa88a9df9dc96a18270af144b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:45:14 +0100 Subject: [PATCH 173/219] prometheus-mysqld-exporter: 0.8.1 -> 0.9.0 --- .../monitoring/prometheus/mysqld-exporter.nix | 10 +-- .../prometheus/mysqld-exporter_deps.nix | 74 ------------------- 2 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 5a274435e3d..ff6eca621e8 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mysqld_exporter-${version}"; - version = "0.8.1"; - rev = version; + version = "0.9.0"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,11 +11,9 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; + sha256 = "0ldjrbhm6n7in4lj6l78xii10mg162rsp09ymjm7y2xar9sd70vp"; }; - goDeps = ./mysqld-exporter_deps.nix; - meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = https://github.com/prometheus/mysqld_exporter; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix deleted file mode 100644 index 4910832a62c..00000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; - sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; - }; - } -] From 398bf54f639c1b028e77d118417e8010ff32ac7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:51:30 +0100 Subject: [PATCH 174/219] prometheus-nginx-exporter: 20161104 -> 20161107 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 4c369f40610..013f80411ad 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "20161104-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203"; + version = "20161107-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2d7dfd13458c0d82671c03dc54f3aa0110a49a05"; goPackagePath = "github.com/discordianfish/nginx_exporter"; src = fetchgit { inherit rev; url = "https://github.com/discordianfish/nginx_exporter"; - sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28"; + sha256 = "17mjbf8v4h7ja87y02ggmyzl3g8ms8s37mcpcq1niijgli37h75d"; }; goDeps = ./nginx-exporter_deps.nix; @@ -19,7 +19,7 @@ buildGoPackage rec { description = "Metrics relay from nginx stats to Prometheus"; homepage = https://github.com/discordianfish/nginx_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From e945c7032dd24c5f7bac48af073019fa421a048e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:52:07 +0100 Subject: [PATCH 175/219] prometheus-pushgateway: 0.3.0 -> 0.3.1 --- .../monitoring/prometheus/pushgateway.nix | 16 ++-- .../prometheus/pushgateway_deps.nix | 74 ------------------- 2 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/pushgateway_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6a742796f30..ccddb078f47 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.3.0"; - rev = version; + version = "0.3.1"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,11 +11,9 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; + sha256 = "0ax83yy5hbfppcr66l9al7wxibcqfnyps05jdscvpwvgrg4q7ldk"; }; - goDeps = ./pushgateway_deps.nix; - buildInputs = [ go-bindata ]; preBuild = '' @@ -29,9 +27,9 @@ buildGoPackage rec { -ldflags= -X main.buildVersion=${version} -X main.buildRev=${rev} - -X main.buildBranch=master + -X main.buildBranch=${rev} -X main.buildUser=nix@nixpkgs - -X main.buildDate=20150101-00:00:00 + -X main.buildDate=19700101-00:00:00 -X main.goVersion=${stdenv.lib.getVersion go} ''; @@ -39,7 +37,7 @@ buildGoPackage rec { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = https://github.com/prometheus/pushgateway; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix deleted file mode 100644 index 33795927ed9..00000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; - sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; - }; - } -] From f1fd88f7f43c89bb3136c6c1978ed3f614868109 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 22:17:04 -0500 Subject: [PATCH 176/219] guile: apply patch fixing 00-repl-server.test stability --- pkgs/development/interpreters/guile/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 97f8f61a98e..b0adb00cb87 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -31,7 +31,13 @@ # libguile/vm-i-system.i is not created in time enableParallelBuilding = false; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++ + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); # Explicitly link against libgcc_s, to work around the infamous From 75cdbf48aecc55e8789efe7b4c6c71fe909efdb2 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Wed, 30 Nov 2016 23:59:05 -0600 Subject: [PATCH 177/219] torbrowser: 6.0.6 -> 6.0.7 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index be93b291dcc..13f2b145663 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.6"; + version = "6.0.7"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else - "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; + "1llgqvxmn572wyxk7r1hf3j6ldi9hkgahm7918rsmsvk66i187h4" else + "16z8qfmcgxbvmv5hriv1gq4lpz54fy04mhhwdd6s72y52dfcvfy3"; }; desktopItem = makeDesktopItem { From e39584c67d24f38c1b050a599d162eb3e764a9bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 09:36:31 +0100 Subject: [PATCH 178/219] pythonPackages.pyjwt: 1.4.0 -> 1.4.2 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e558c7d43ae..81f183e4876 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20249,14 +20249,15 @@ in { }; pyjwt = buildPythonPackage rec { - version = "1.4.0"; + version = "1.4.2"; name = "pyjwt-${version}"; src = pkgs.fetchurl { url = "http://github.com/progrium/pyjwt/archive/${version}.tar.gz"; - sha256 = "118rzhpyvx1h4hslms4fdizyv6mnyd4g34fv089lvs116pj08k9c"; + sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn"; }; + buildInputs = with self; [ pytestrunner pytestcov pytest_27 coverage ]; propagatedBuildInputs = with self; [ pycrypto ecdsa ]; meta = { From d22432880b83367a6e7b901427e48f1b70551727 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 09:36:46 +0100 Subject: [PATCH 179/219] pythonPackages.oauthlib: 0.7.2 -> 2.0.0 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81f183e4876..94c50396443 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16039,17 +16039,17 @@ in { }; oauthlib = buildPythonPackage rec { - version = "0.7.2"; + version = "2.0.0"; name = "oauthlib-${version}"; src = pkgs.fetchurl { - url = "https://github.com/idan/oauthlib/archive/${version}.tar.gz"; - sha256 = "08b7swyswhxh90k9mp54rk1qks2l2s2pdcjap6x118y27p7dhp4h"; + url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; + sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ pycrypto blinker pyjwt ]; + propagatedBuildInputs = with self; [ cryptography blinker pyjwt ]; meta = { homepage = https://github.com/idan/oauthlib; From 1e17f21b3e844b28cb78142dd304b98a20fc8b3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 12:55:24 +0100 Subject: [PATCH 180/219] firefox: 50.0.1 -> 50.0.2 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 15849b1f1ed..3ab8ced9fc8 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.0.1"; - sha512 = "3gz7z5vk5zzwy6zzay4s72rbjmlgdgbij859ppzx6h38vhljj4vl7s9g5rg2byx9vjar593i9jhx46mr8bzr3530291aq8a7qmss4hw"; + version = "50.0.2"; + sha512 = "cfcc3e5a703e4d3284e3b3dcb34e5f77825e5a98b49a75bf22f8ac431c0429e6cd21c4e1f5e046fe82899cb4d2bc5b7a432b306c4af35034d83a9f351393f7fd"; }; firefox-esr-unwrapped = common { From b221fc137c76bbc118639f323bfaadfe04dd1456 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 13:02:35 +0100 Subject: [PATCH 181/219] nss: 3.27.1 -> 3.27.2 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ff8b0fec0a1..72f57dff1ce 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz"; - sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"; + url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz"; + sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524"; }; buildInputs = [ nspr perl zlib sqlite ]; From f4aab5b211e3302d81612bdc76aa8164c913ed8b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 13:06:41 +0100 Subject: [PATCH 182/219] thunderbird: 45.5.0 -> 45.5.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 9e2baf94527..fb78c3cca24 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.5.0"; in +let version = "45.5.1"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "719469c4f66a9e4b09c360056c63ef2e1803334901dd4a23f12e455fe8ae4d0aba0a6273b3cf2796c925dc93f0add3df011ffe40148ef0b3f226d0b1a1c37b6a"; + sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx From d42cfcec928982b86c3f263d7f2684741f2f71d6 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 1 Dec 2016 14:10:09 +0100 Subject: [PATCH 183/219] all-packages: move terminus-ttf beside terminus --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c306e6a69..c470ea24b8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12023,6 +12023,8 @@ in terminus_font = callPackage ../data/fonts/terminus-font { }; + terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; @@ -17643,6 +17645,4 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; - - terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; } From d2523a4f3db5fa80f835c10188dd59a25be0c2ee Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 1 Dec 2016 13:51:47 +0100 Subject: [PATCH 184/219] rssh: Make rssh a valid shell The rssh package did not have the 'shellPath' attribute, so it could not be used as the default shell for a nixos user. I fixed this by adding the attribute. --- pkgs/shells/rssh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index 8aa6c2608fa..f1fb4d03121 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -79,4 +79,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ arobyn ]; }; + + passthru = { + shellPath = "/bin/rssh"; + }; } From cef18b345d06791833f571568a2b88889aa7d780 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 1 Dec 2016 11:57:32 -0200 Subject: [PATCH 185/219] enlightenment: 0.21.3 -> 0.21.4 --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index e3d676fd4f6..d2091eeb8e9 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.3"; + version = "0.21.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1ljzcq775njhbcaj8vdnypf2rgc6yqqdwfkf7c22603qvv9if1dr"; + sha256 = "085zn6vdy904fxa9krx7ljv61yg96b2xk56g0bx2lyq1d33sgl8f"; }; nativeBuildInputs = [ pkgconfig ]; From 58d2d460d0bc11083ac2f547228fc11f589120a5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 1 Dec 2016 17:30:51 +0300 Subject: [PATCH 186/219] pythonPackages.pyrsistent: propagate six --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94c50396443..0808f609387 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20512,7 +20512,8 @@ in { sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5"; }; - buildInputs = with self; [ six pytest hypothesis ]; + propagatedBuildInputs = with self; [ six ]; + buildInputs = with self; [ pytest hypothesis ]; checkPhase = '' py.test From e72b7ebd980c1c9a0cac0b9499ab88105416d663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Thu, 1 Dec 2016 15:40:37 +0100 Subject: [PATCH 187/219] youtube-dl: 2016.11.27 -> 2016.12.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c1d4d3c1556..9dff0c8214f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.27"; + version = "2016.12.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "6ecc3996e28b6274d159643641a964098549b4cb8b33a3a3481148b88166e2cc"; + sha256 = "ddff281a251c7a40bf8c28afa1df63e9a64ff61b6b8097535fbbe587e8ccaef7"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From 16eb67ac9ca52d56ff13fb3cda2e4644df9f387b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 1 Dec 2016 17:20:33 +0100 Subject: [PATCH 188/219] hdf5: 1.8.16 -> 1.8.18 For release announcement, see https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-1.8.18-RELEASE.txt --- pkgs/tools/misc/hdf5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 0fd33fc3e39..7215cccbfed 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -15,11 +15,11 @@ assert !cpp || mpi == null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - version = "1.8.16"; + version = "1.8.18"; name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2"; - sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2"; + sha256 = "13542vrnl1p35n8vbq0wzk40vddmm33q5nh04j98c7r1yjnxxih1"; }; passthru = { From 9e4538112ac0b2579cb140abb7798becb3af100e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:49:30 +0100 Subject: [PATCH 189/219] pythonPackages.acoustics: init at 0.1.2 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0808f609387..09f35be2798 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -41,6 +41,30 @@ in { setuptools = callPackage ../development/python-modules/setuptools { }; + acoustics = buildPythonPackage rec { + pname = "acoustics"; + version = "0.1.2"; + name = pname + "-" + version; + + buildInputs = with self; [ cython pytest ]; + propagatedBuildInputs = with self; [ numpy scipy matplotlib pandas tabulate ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7"; + }; + + # Tests not distributed + doCheck = false; + + meta = { + description = "A package for acousticians"; + maintainer = with maintainers; [ fridh ]; + license = with licenses; [ bsd ]; + homepage = https://github.com/python-acoustics/python-acoustics; + }; + }; + agate = buildPythonPackage rec { name = "agate-1.2.2"; disabled = isPy3k; From d80d92793e75daba2ce5e941a0515ea8e3364639 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2016 12:27:59 +0100 Subject: [PATCH 190/219] LTS Haskell 7.11 --- .../configuration-hackage2nix.yaml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ab42bbd0836..265edae2157 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 7.10 + # LTS Haskell 7.11 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -380,7 +380,7 @@ default-package-overrides: - cpu ==0.1.2 - crackNum ==1.5 - criterion ==1.1.1.0 - - cron ==0.4.1.2 + - cron ==0.4.2 - crypto-api ==0.13.2 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 @@ -467,7 +467,7 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.9 + - dns ==2.0.10 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 @@ -480,7 +480,7 @@ default-package-overrides: - double-conversion ==2.0.1.0 - download ==0.3.2.5 - dpor ==0.2.0.0 - - drawille ==0.1.0.6 + - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.2 - drifter-postgresql ==0.0.2 @@ -552,7 +552,7 @@ default-package-overrides: - fay-text ==0.3.2.2 - fay-uri ==0.2.0.0 - fb ==1.0.13 - - fclabels ==2.0.3.1 + - fclabels ==2.0.3.2 - feature-flags ==0.1.0.1 - feed ==0.3.11.1 - FenwickTree ==0.1.2.1 @@ -578,20 +578,20 @@ default-package-overrides: - fmlist ==0.9 - fn ==0.3.0.1 - focus ==0.1.5 - - fold-debounce ==0.2.0.3 + - fold-debounce ==0.2.0.4 - fold-debounce-conduit ==0.1.0.4 - foldl ==1.2.1 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 - foreign-store ==0.2 - - formatting ==6.2.3 + - formatting ==6.2.4 - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 - - freer ==0.2.3.0 + - freer ==0.2.4.1 - friendly-time ==0.4 - frisby ==0.2 - frontmatter ==0.1.0.2 @@ -652,7 +652,7 @@ default-package-overrides: - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - - Glob ==0.7.12 + - Glob ==0.7.13 - gloss ==1.10.2.3 - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.2 @@ -934,7 +934,7 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.3 - http-api-data ==0.2.4 - - http-client ==0.4.31.1 + - http-client ==0.4.31.2 - http-client-openssl ==0.2.0.4 - http-client-tls ==0.2.4.1 - http-common ==0.8.2.0 @@ -1249,7 +1249,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - octane ==0.16.3 - Octree ==0.5.4.3 - - oeis ==0.3.7 + - oeis ==0.3.8 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1257,7 +1257,7 @@ default-package-overrides: - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.2.1 + - opaleye ==0.5.2.2 - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 @@ -1441,7 +1441,7 @@ default-package-overrides: - readable ==0.3.1 - ReadArgs ==1.2.2 - readline ==1.0.3.0 - - rebase ==1.0.3 + - rebase ==1.0.6 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1488,7 +1488,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.7 - rethinkdb-client-driver ==0.0.23 - - retry ==0.7.4.1 + - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1590,7 +1590,7 @@ default-package-overrides: - snap-core ==1.0.1.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - - soap ==0.2.3.1 + - soap ==0.2.3.2 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - socket ==0.6.1.0 @@ -1771,12 +1771,12 @@ default-package-overrides: - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 - transient ==0.4.4.1 - - transient-universe ==0.3.5 + - transient-universe ==0.3.5.1 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 - tree-view ==0.4 - tries ==0.0.4 - - trifecta ==1.6 + - trifecta ==1.6.1 - true-name ==0.1.0.2 - ttrie ==0.1.2.1 - tttool ==1.6.1.2 @@ -1798,7 +1798,7 @@ default-package-overrides: - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 - tzdata ==0.1.20160614.0 - - ua-parser ==0.7.1 + - ua-parser ==0.7.2 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbound-generics ==0.3.1 @@ -1828,7 +1828,7 @@ default-package-overrides: - unix-time ==0.3.7 - Unixutils ==1.54.1 - unordered-containers ==0.2.7.1 - - uri-bytestring ==0.2.2.0 + - uri-bytestring ==0.2.2.1 - uri-encode ==1.5.0.5 - url ==2.1.3 - urlpath ==5.0.0.1 @@ -1846,7 +1846,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.7 - validate-input ==0.4.0.0 - - validation ==0.5.3 + - validation ==0.5.4 - varying ==0.5.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.3 @@ -1910,7 +1910,7 @@ default-package-overrides: - weigh ==0.0.3 - werewolf ==1.5.1.1 - werewolf-slack ==1.0.2.0 - - wikicfp-scraper ==0.1.0.5 + - wikicfp-scraper ==0.1.0.6 - Win32 ==2.3.1.1 - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 @@ -1928,8 +1928,8 @@ default-package-overrides: - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 - - writer-cps-mtl ==0.1.0.2 - - writer-cps-transformers ==0.1.0.2 + - writer-cps-mtl ==0.1.1.0 + - writer-cps-transformers ==0.1.1.0 - wuss ==1.1.1 - X11 ==1.6.1.2 - x509 ==1.6.4 From 10b832e4645d379def491a91428e5fc8d9c36e22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 27 Nov 2016 17:36:27 +0100 Subject: [PATCH 191/219] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-11-g4525071 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c09fb8e04139674e977af03bfeb1a586e0d1a95. --- .../haskell-modules/hackage-packages.nix | 2094 +++++++++++------ 1 file changed, 1425 insertions(+), 669 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bd046c77d50..4640b607e7c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1768,8 +1768,8 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.0.3"; - sha256 = "a7aeaa8154c62fb6e64f661c34bc28f35b02ec5a8d87f6100a8d945b59db82c1"; + version = "0.2.0.4"; + sha256 = "392de367b3caaa293a6a1d341217c8c08e58c14b3cddd3943b88b59a3b848b6e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6142,29 +6142,6 @@ self: { }) {}; "Glob" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.12"; - sha256 = "c7ca5459b2d98ae9f5db56351a512680c4375cfdf907073848aaf15d6b92c175"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_7_13" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6185,7 +6162,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -7363,7 +7339,7 @@ self: { "HJVM" = callPackage ({ mkDerivation, base, Cabal, containers, filepath - , haskell-src-exts, HUnit, jvm, mtl, parsec, process + , haskell-src-exts, HUnit, jdk, mtl, parsec, process , test-framework, test-framework-hunit, transformers }: mkDerivation { @@ -7374,7 +7350,7 @@ self: { base containers filepath haskell-src-exts mtl parsec process transformers ]; - librarySystemDepends = [ jvm ]; + librarySystemDepends = [ jdk ]; testHaskellDepends = [ base Cabal haskell-src-exts HUnit mtl parsec test-framework test-framework-hunit transformers @@ -7383,7 +7359,7 @@ self: { description = "A library to create a Java Virtual Machine and manipulate Java objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {jvm = null;}; + }) {inherit (pkgs) jdk;}; "HJavaScript" = callPackage ({ mkDerivation, base, pretty }: @@ -12149,8 +12125,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.4"; - sha256 = "45ee5a82f1cecc381299d1998ae194ee05348a30cfa827cd5aea277310bf5c5b"; + version = "0.3.2.5"; + sha256 = "e036a091b68190b8a6491cde1e14189f00c0c04de05a07a12678dc48d587543f"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -12802,6 +12778,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; + "OpenGLRaw_3_2_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.4.0"; + sha256 = "e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -18324,8 +18318,8 @@ self: { pname = "ZEBEDDE"; version = "0.1.0.0"; sha256 = "27b4f25adda6a500627a9311fe4c74c92dae0a18789cc7ea8e828c74a0ba05c5"; - revision = "3"; - editedCabalFile = "bd302015dbeab652042fed7c86f942d1cdf28d365de82e742290d5aac13d97c2"; + revision = "5"; + editedCabalFile = "5974fb98c510f354b64292143938ae0ccaebf69acd95400b5ac0cdb1d7deba9d"; libraryHaskellDepends = [ base vect ]; description = "Polymer growth simulation method"; license = stdenv.lib.licenses.bsd3; @@ -19521,8 +19515,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "acme-year"; - version = "2015"; - sha256 = "3b8b506b4d38b3e781aa3296f10643e76214a3a80e023c653951c41d8aefbafa"; + version = "2016"; + sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "http://github.com/joeyadams/hs-acme-year"; @@ -20146,8 +20140,8 @@ self: { }: mkDerivation { pname = "aeson-filthy"; - version = "0.1"; - sha256 = "d4dc207915fca4e65a2de331898ea870c9e09247a93dd0bc0abe159b932ee0b4"; + version = "0.1.1"; + sha256 = "58fda3fb2ba49a952242d570bce4fa2cae47c0a47957e5f4b9ef66b9de5663cb"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers ]; @@ -20845,8 +20839,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.3"; - sha256 = "400b00cde06525918c0ece01f1a5c411b27c4d5f45d9316ccb03380255e1a911"; + version = "0.3.1"; + sha256 = "e5db4e1da578aa873d1777a82ce3ab84af8fc58cc55ac76d19835bb4e004e852"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl random stm time @@ -20963,8 +20957,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.6"; - sha256 = "7b4c8179260f865fb6e00005c679ee9894403f098ae462082891bd0f6bed59ef"; + version = "4.6.1"; + sha256 = "0177336d1d520bf303a3702a90dd33e31195d825f949872f3525fe940b7c01f8"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -33282,6 +33276,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_8_1_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.8.1.3"; + sha256 = "8c16e717d353f981e0cd67b50f89ef6f94ab9c56662b3e58bd8a6c552433d637"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-html-contrib" = callPackage ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe , text @@ -33370,6 +33387,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_7_1_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.7.1.1"; + sha256 = "638da5984ecd5bcc87f5836786ff93352058a8856bea428d7ffd25bc26c54303"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -33717,14 +33754,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blosum_0_1_1_3" = callPackage + "blosum_0_1_1_4" = callPackage ({ mkDerivation, base, containers, fasta, lens , optparse-applicative, pipes, pipes-text, split, text, text-show }: mkDerivation { pname = "blosum"; - version = "0.1.1.3"; - sha256 = "bff68ec89bf8f7c70b18a8d13df8b9e464eea6168ec3df935f7d3391e6196de1"; + version = "0.1.1.4"; + sha256 = "44b12d24d56bfadec7a53c1d620e1cc52f4126ba01ab541a135b187846c10380"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34135,6 +34172,8 @@ self: { pname = "boolsimplifier"; version = "0.1.8"; sha256 = "096fa9377241520ee114403fd53b51a7369187fb4dca65f19f85a727d689828f"; + revision = "1"; + editedCabalFile = "d05220c8f3aaeb0c5f6f92cd6c3d869b7f5253b66cdb6d5d392b9198ec061577"; libraryHaskellDepends = [ base containers ]; description = "Simplification tools for simple propositional formulas"; license = stdenv.lib.licenses.bsd3; @@ -34800,8 +34839,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.3"; - sha256 = "8a3da08e222498a245405d77eed7da90a943e848396291e617ba0b6daf27ad6f"; + version = "0.2.4.4"; + sha256 = "01c0bafb776784a08c041abfc89c3eaee3236bf5555b98e9542676dc43db2dd8"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -35393,6 +35432,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-handle_0_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "bytestring-handle"; + version = "0.1.0.5"; + sha256 = "a2c426f35ba32822e45bcc2e6d4945bbb2ee10b8540bb0965ab6f3304325bb83"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; + description = "ByteString-backed Handles"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-lexing" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -35914,8 +35972,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.3"; - sha256 = "09d5531215a3c963adc80bd40402d16c7a59698537ee4d21c7d3f9b7c486d56f"; + version = "4.35.5"; + sha256 = "7cd914109290b09c8269a42809cb0d0c29d5e9f9dec8226333d2e3179bb8c381"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35928,10 +35986,6 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -36005,6 +36059,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-file-th_0_2_4" = callPackage + ({ mkDerivation, base, Cabal, directory, pretty, template-haskell + }: + mkDerivation { + pname = "cabal-file-th"; + version = "0.2.4"; + sha256 = "0b55d7ffacd0c6324fa7c8b8f148e788e6b899fb9bf8795285dea66575bed91c"; + libraryHaskellDepends = [ + base Cabal directory pretty template-haskell + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://github.com/nkpart/cabal-file-th"; + description = "Template Haskell expressions for reading fields from a project's cabal file"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-ghc-dynflags" = callPackage ({ mkDerivation, base, Cabal, ghc, transformers }: mkDerivation { @@ -36358,6 +36429,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_10_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.10.1"; + sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal directory filepath old-locale process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38399,6 +38489,29 @@ self: { pname = "cayley-client"; version = "0.2.1.0"; sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19"; + revision = "1"; + editedCabalFile = "96e6564d03d1aa6a47aba589a085374b0c50a85af96ed56d1f884774905c0359"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cayley-client_0_2_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.2.1.1"; + sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -39660,8 +39773,10 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.2.0"; - sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70"; + version = "0.3"; + sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5"; + revision = "1"; + editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -39670,7 +39785,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/chronos#readme"; - description = "A time library, encoding, decoding, and instances"; + description = "A performant time library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40516,6 +40631,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude_1_0_2" = callPackage + ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim + , hashable, hspec, lifted-async, lifted-base, monad-unlift + , mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, safe-exceptions, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.0.2"; + sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467"; + libraryHaskellDepends = [ + async base basic-prelude bifunctors bytestring chunked-data + containers deepseq dlist exceptions ghc-prim hashable lifted-async + lifted-base monad-unlift mono-traversable + mono-traversable-instances mtl mutable-containers primitive + safe-exceptions say semigroups stm stm-chans text time + time-locale-compat transformers transformers-base + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -40538,6 +40685,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-conduit_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.0.2"; + sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "classy-prelude together with conduit functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -40558,6 +40727,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-yesod_1_0_2" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "1.0.2"; + sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -42926,8 +43115,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { pname = "composition-tree"; - version = "0.2.0.2"; - sha256 = "67d26787ad5e35d1840b5e1bd325bb12815bd151faa0f6e13aaeb55e63af9bd6"; + version = "0.2.0.3"; + sha256 = "40243191eb557a9a5d7a6986dee5aa56968a3f36901a2ca6035310cfc4b255cc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/liamoc/composition-tree"; @@ -43627,6 +43816,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-combinators_1_0_8_3" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, chunked-data, conduit, conduit-extra, containers + , directory, filepath, hspec, monad-control, mono-traversable, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , text, transformers, transformers-base, unix, unix-compat, vector + , void + }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.0.8.3"; + sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Commonly used conduit functions, for both chunked and unchunked data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -44220,6 +44438,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "console-style" = callPackage + ({ mkDerivation, base, mtl, semigroups, transformers }: + mkDerivation { + pname = "console-style"; + version = "0.0.2.0"; + sha256 = "5e6e372560a61bcd882af5f8255e6c3fbe4d28e8ad459e3dc9c28853ef809f5c"; + libraryHaskellDepends = [ base mtl semigroups transformers ]; + homepage = "https://github.com/minad/console-style#readme"; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + }) {}; + "const-math-ghc-plugin" = callPackage ({ mkDerivation, base, containers, directory, ghc, process }: mkDerivation { @@ -46540,27 +46770,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat - , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.4.1.2"; - sha256 = "554c0b971306e55815cce41e2b1c6cc14aaecd7728795310d13b114e5260daa5"; - libraryHaskellDepends = [ - attoparsec base mtl mtl-compat old-locale semigroups text time - ]; - testHaskellDepends = [ - attoparsec base derive quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck text time transformers-compat - ]; - homepage = "http://github.com/michaelxavier/cron"; - description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cron_0_4_2" = callPackage ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers-compat @@ -46581,7 +46790,6 @@ self: { homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -47272,8 +47480,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.5.0"; - sha256 = "6eacf0967f30ae543f25e3a0982f015c10d7241dba680b5d889bfe5a4ad6d29e"; + version = "0.6.0"; + sha256 = "08d43d6d701b85ffa3617c8142e23a32daef3156a704b0d30d892e1beb875424"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -47291,8 +47499,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.0.1"; - sha256 = "ed771c3351358b67b25aecfaebdacdf38c5dffe2dddf306dc93466fd440c3978"; + version = "5.1.0"; + sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -47309,8 +47517,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.6"; - sha256 = "846b3c456ba92f538b101a682fe796e91352c680070344f6296db99b740a64a2"; + version = "0.2.0"; + sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -47342,8 +47550,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.9.3"; - sha256 = "b63d2a0634f789a851b897755db0d0596c48ba4348bd224c60d450e7c8803a06"; + version = "0.1.0.0"; + sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim hashable temporal-media transformers @@ -47358,8 +47566,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.6.5"; - sha256 = "f68d07f9099f4f89395fe60093164a4ac2bbe2bf6aa2aaa3d3eae0fb7b349058"; + version = "0.0.7.0"; + sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -47399,6 +47607,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cspretty" = callPackage + ({ mkDerivation, base, containers, pretty }: + mkDerivation { + pname = "cspretty"; + version = "1.0"; + sha256 = "29a77c88684614ca41e88d8ee83b51cbd62ab12f7770701cb6699bc38d0a3909"; + libraryHaskellDepends = [ base containers pretty ]; + description = "AST and pretty printer for CSPm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "css" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -47726,8 +47945,8 @@ self: { ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { pname = "cudd"; - version = "0.1.0.3"; - sha256 = "8e0684c4e01f4d48140d3cedbe15548c747a389e4e32bbe388a1341350dd675d"; + version = "0.1.0.3.1"; + sha256 = "95c05f80bb0caad6bc372ab511a7a74c6cf1c025c54d15105a573b3fec64d730"; libraryHaskellDepends = [ array base mtl transformers ]; librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; @@ -50255,8 +50474,8 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.0.2"; - sha256 = "e79f13a2001031230b968d582bc5c3567568b673d4ea9cc3571451c2deaddae2"; + version = "0.2.1"; + sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath hashable HTTP stringsearch text time vector @@ -52050,12 +52269,14 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.0.3"; - sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e"; + version = "0.1.0.4"; + sha256 = "eb45d84603824334442b68ef07eb107d1b7ccd69e17161ef2a7fc5b5b4df339a"; + revision = "1"; + editedCabalFile = "7b6e8b2dc9d542e818d131d4f6e52a14fed5dce75c20855b7f2d21ab51b74608"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; - description = "Derive Storable instances with help of GHC.Generics."; + description = "Derive Storable instances with GHC.Generics."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52435,8 +52656,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.8"; - sha256 = "28633d2a5374ba3c9e56ff798242889986b9a5958e0bd2b35df342b4ac4c5744"; + version = "0.8.0.1"; + sha256 = "6e9b0eba4c9aa698ffdd21d55492b4cfd867cd4107ed8ccc591888cba7fe5b1c"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -52685,8 +52906,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4"; - sha256 = "79dbb7fa0b28b04cf0804fb993e04b22f7e1261089c0aa4e7fe06894edcce0b9"; + version = "0.4.0.1"; + sha256 = "594ed547bbbdce511f48048bc3626c134bc468133e908fe3512d2fadeb7342f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53416,8 +53637,8 @@ self: { }: mkDerivation { pname = "digestive-bootstrap"; - version = "0.1.0.1"; - sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7"; + version = "0.3.0.0"; + sha256 = "5898973e9887a18b7763d0412b3b3569426fae506e2033608a9ec4e0c1eeec03"; libraryHaskellDepends = [ base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text @@ -54811,10 +55032,8 @@ self: { }: mkDerivation { pname = "dixi"; - version = "0.6.9.1"; - sha256 = "938923def44d17f193907edc2e928fe63eeca685dd9f5527c791718e3e8e6c6a"; - revision = "1"; - editedCabalFile = "1165d61068ddfdb1f480130f9aefc110505e0514484014fe4f3b69ecdd8e1b61"; + version = "0.6.9.2"; + sha256 = "39190af5648c2f39f133d140856d62cceefbe96f02a570bba68d442908dcb6d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55010,29 +55229,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.9"; - sha256 = "b0d6c335dd9fdfa85e8389c67fc4a132d47ecb871c32332cb7858ceaa045fb8c"; - libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_10" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -55053,7 +55249,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -56026,19 +56221,6 @@ self: { }) {}; "drawille" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck }: - mkDerivation { - pname = "drawille"; - version = "0.1.0.6"; - sha256 = "3282ca7d783580f95349ffd85b6f668f57a354aad74a84c37406fc8ef2636c09"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - homepage = "https://github.com/yamadapc/haskell-drawille"; - description = "A port of asciimoo's drawille to haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "drawille_0_1_2_0" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "drawille"; @@ -56049,26 +56231,25 @@ self: { homepage = "https://github.com/yamadapc/haskell-drawille#readme"; description = "A port of asciimoo's drawille to haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dresdner-verkehrsbetriebe" = callPackage ({ mkDerivation, aeson, base, bytestring, HTTP, old-locale - , optparse-applicative, time, unordered-containers, vector + , optparse-applicative, text, time, unordered-containers, vector }: mkDerivation { pname = "dresdner-verkehrsbetriebe"; - version = "0.1.1"; - sha256 = "380af7c7a9181b3d8b3a9e1bce271a71071781d3055a669b31492217f6c8babf"; + version = "1.0.0"; + sha256 = "8c23ab7f2f3b8c7c885eb5f6fd9aff7f644656a07ad2a4b0cd13437f9201b20a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring HTTP old-locale time unordered-containers - vector + aeson base bytestring HTTP old-locale text time + unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring HTTP old-locale optparse-applicative time - unordered-containers vector + aeson base bytestring HTTP old-locale optparse-applicative text + time unordered-containers vector ]; description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)"; license = stdenv.lib.licenses.mit; @@ -57209,6 +57390,31 @@ self: { license = "unknown"; }) {}; + "ede_0_2_8_6" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors + , bytestring, comonad, directory, filepath, free, lens, mtl + , parsers, scientific, semigroups, tasty, tasty-golden, text + , text-format, text-manipulate, trifecta, unordered-containers + , vector + }: + mkDerivation { + pname = "ede"; + version = "0.2.8.6"; + sha256 = "6388ce61ebc6153fcae1aeabe426ef4eb07f2080fd5019bb4d441184570cf2a5"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bifunctors bytestring comonad directory + filepath free lens mtl parsers scientific semigroups text + text-format text-manipulate trifecta unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring directory tasty tasty-golden text + ]; + homepage = "http://github.com/brendanhay/ede"; + description = "Templating language with similar syntax and features to Liquid or Jinja2"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "edenmodules" = callPackage ({ mkDerivation, base, containers, deepseq, parallel }: mkDerivation { @@ -59577,6 +59783,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_1_3" = callPackage + ({ mkDerivation, base, safe, transformers, transformers-compat + , unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.1.3"; + sha256 = "201a1d9d2fba16dff734eb79e07f138718ed62f5a0a846cf0cee743828844df1"; + libraryHaskellDepends = [ + base safe transformers transformers-compat unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -60160,19 +60382,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_0_13_1_7" = callPackage + "eventstore_0_14_0_0" = callPackage ({ mkDerivation, aeson, array, base, cereal, classy-prelude - , connection, containers, dns, dotnet-timespan, http-client + , connection, containers, dns, dotnet-timespan, http-client, mtl , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.13.1.7"; - sha256 = "a0c6ea5e91f56dc8027bb34825c1382c31cd26ac291c5a7c988bec0681c5e8d8"; + version = "0.14.0.0"; + sha256 = "0855c29baa25f14da74804bd324a4e4fb4f51f7609df3d0c6fbb0ef09d81552d"; libraryHaskellDepends = [ aeson array base cereal classy-prelude connection containers dns - dotnet-timespan http-client protobuf random semigroups stm time + dotnet-timespan http-client mtl protobuf random semigroups stm time unordered-containers uuid ]; testHaskellDepends = [ @@ -61968,22 +62190,6 @@ self: { }) {}; "fclabels" = callPackage - ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers - }: - mkDerivation { - pname = "fclabels"; - version = "2.0.3.1"; - sha256 = "b993e35fd89945669c8b3cd95fa9dee618eb6a5256f8909ccbdc8ec713f75c8b"; - libraryHaskellDepends = [ base mtl template-haskell transformers ]; - testHaskellDepends = [ - base HUnit mtl template-haskell transformers - ]; - homepage = "https://github.com/sebastiaanvisser/fclabels"; - description = "First class accessor labels implemented as lenses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fclabels_2_0_3_2" = callPackage ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers }: mkDerivation { @@ -61997,7 +62203,6 @@ self: { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fclabels-monadlib" = callPackage @@ -63689,19 +63894,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_2_2" = callPackage + "flat-mcmc_1_4_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.2.2"; - sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937"; + version = "1.4.0"; + sha256 = "daf0ba3202b7c315e022db361eb01d399d6cec4c742a12d94aeb7a13e95f2b7b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector ]; + executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base vector ]; homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; @@ -64271,6 +64479,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt" = callPackage + ({ mkDerivation, base, text, text-format }: + mkDerivation { + pname = "fmt"; + version = "0.0.0.1"; + sha256 = "e118bd72ec75ad1c749cf43492e85aeed5ee8a3cf616e2af4884f492123d8b30"; + libraryHaskellDepends = [ base text text-format ]; + homepage = "http://github.com/aelve/fmt"; + description = "Nice formatting library"; + license = stdenv.lib.licenses.mit; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai @@ -64326,23 +64546,6 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay - , time - }: - mkDerivation { - pname = "fold-debounce"; - version = "0.2.0.3"; - sha256 = "ca5eaa3ea7eea742c961df63249920021824a949c879053ff34bdeef4fb7a7af"; - libraryHaskellDepends = [ - base data-default-class stm stm-delay time - ]; - testHaskellDepends = [ base hspec stm time ]; - homepage = "https://github.com/debug-ito/fold-debounce"; - description = "Fold multiple events that happen in a given period of time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce_0_2_0_4" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time }: @@ -64357,7 +64560,6 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fold-debounce-conduit" = callPackage @@ -64836,21 +65038,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, base, clock, old-locale, scientific, text - , text-format, time - }: - mkDerivation { - pname = "formatting"; - version = "6.2.3"; - sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc"; - libraryHaskellDepends = [ - base clock old-locale scientific text text-format time - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_2_4" = callPackage ({ mkDerivation, base, clock, old-locale, scientific, text , text-format, time }: @@ -64863,7 +65050,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -65645,29 +65831,6 @@ self: { libfreenect = null;}; "freer" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "freer"; - version = "0.2.3.0"; - sha256 = "e0ef288ad5c8fc5b1ab7a50413e435648251575bb6803d41374d702fc5ad44b8"; - revision = "2"; - editedCabalFile = "39d3fcc74267e006eae237770ac8d6b7c651a927913544fb74a260ac8307beca"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - homepage = "https://gitlab.com/queertypes/freer"; - description = "Implementation of the Freer Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "freer_0_2_4_1" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit , tasty-quickcheck }: @@ -69101,8 +69264,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.0"; - sha256 = "433c06b7c445fd9edfc081720ab51f9ced41994f481d66d4ce181df583efda38"; + version = "0.7.0.2"; + sha256 = "eccf3df2533b5ebcc619f79bb791b84e01765ce66f77b3039cbece34a0302de1"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -69131,8 +69294,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.7.0.0"; - sha256 = "5359536c791cfaf24fb8a5884d30cc117ad869ab773b977293d6424b52520a2d"; + version = "0.7.0.1"; + sha256 = "3a4d95d81f32e46bbd0b50254d56b57315dbfd2cdd47845116095356f5122af4"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -69144,8 +69307,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.0"; - sha256 = "da1532bf854bc9d0ae311dd1b1f14900f1258e6e29884b8c35c9326c55811ed9"; + version = "0.7.0.2"; + sha256 = "7ff04a5bc39b2b84c98badd6f8f569ca9d97fec348c0734821801f7090a1efd6"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -70298,6 +70461,8 @@ self: { pname = "giphy-api"; version = "0.4.0.0"; sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876"; + revision = "2"; + editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5"; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -70313,7 +70478,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "giphy-api_0_5_0_0" = callPackage + "giphy-api_0_5_1_0" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls , lens, microlens, microlens-th, mtl, network-uri, servant @@ -70321,8 +70486,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.5.0.0"; - sha256 = "12ad1a1080348dfd4033d4c97e5b2a7c3d3da8d342c78c520a5d51396474b16e"; + version = "0.5.1.0"; + sha256 = "b4b33df49353f67621fba1655cf5938c5ca6f1e563e349a3f9a43edc6a98fa99"; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -79181,8 +79346,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.1.0"; - sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84"; + version = "4.9.2.0"; + sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79387,8 +79552,8 @@ self: { }: mkDerivation { pname = "hakyll-filestore"; - version = "0.1.4"; - sha256 = "4f4a4ff6312fd8a226357329c19b7da9ad0547b3683679ce033a1b82dd7d4bb9"; + version = "0.1.5"; + sha256 = "f013b519a8fd552f21ca5b487ea01436e3c649cdc34fe907035a46ff74e83e3a"; libraryHaskellDepends = [ base filestore hakyll time time-locale-compat ]; @@ -81043,20 +81208,22 @@ self: { "hascas" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, hspec, mtl, network, stm, template-haskell - , uuid + , data-binary-ieee754, hspec, mtl, network, safe-exceptions, stm + , template-haskell, uuid }: mkDerivation { pname = "hascas"; - version = "0.1.0.0"; - sha256 = "25dc79e9e8798d35932b1f8729330a1863fe93278778e4a3265c9a0dba504ccd"; + version = "1.0.0"; + sha256 = "004dba51e8cfa2b2e41fd9b51d8bdfb877a4ce19c46b412862327d567c64ccea"; + revision = "1"; + editedCabalFile = "dd3a3609ef9afd3507fc7c0a425683e2900da0b70512a5ef4342f39548c8d1a2"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 mtl network - stm template-haskell uuid + safe-exceptions stm template-haskell uuid ]; testHaskellDepends = [ base binary bytestring containers data-binary-ieee754 hspec mtl - network stm template-haskell uuid + network safe-exceptions stm template-haskell uuid ]; homepage = "https://github.com/eklavya/hascas#readme"; description = "Cassandra driver for haskell"; @@ -81317,6 +81484,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap_1_3_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable }: + mkDerivation { + pname = "hashmap"; + version = "1.3.2"; + sha256 = "01409d423e27f529602b376cfb506afe7a47f73b2ca1e362638c4fccfbba5796"; + libraryHaskellDepends = [ base containers deepseq hashable ]; + homepage = "https://github.com/foxik/hashmap"; + description = "Persistent containers Map and Set based on hashing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashring" = callPackage ({ mkDerivation, base, containers, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -81617,8 +81797,10 @@ self: { ({ mkDerivation, base, containers, mtl, protolude, text }: mkDerivation { pname = "haskelisp"; - version = "0.1.0.5"; - sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949"; + version = "0.1.1.0"; + sha256 = "1a5e1901451ecf5a3152a77686c7c625ea934f11f5cef22ffa38b5ae28ead372"; + revision = "1"; + editedCabalFile = "a1b283345ab2aa1553f6293a7b261e973bcb546a0eaecbfd76a9fd5978052041"; libraryHaskellDepends = [ base containers mtl protolude text ]; homepage = "http://github.com/githubuser/haskelisp#readme"; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; @@ -88106,8 +88288,8 @@ self: { }: mkDerivation { pname = "hint-server"; - version = "1.4.2"; - sha256 = "c579a71d68272dc463ba9625027615bd323fdbbe8780bd462d05694c375866e7"; + version = "1.4.3"; + sha256 = "fecb7fd63ff216054ba1a6569b85757ae6227ce6aa2b0b55ea1c35a54a45ffdd"; libraryHaskellDepends = [ base eprocess exceptions hint monad-loops mtl ]; @@ -88116,6 +88298,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hinterface" = callPackage + ({ mkDerivation, array, async, base, binary, bytestring, containers + , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory + , monad-control, monad-logger, mtl, network, QuickCheck, random + , resourcet, safe-exceptions, stm, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "hinterface"; + version = "0.5.0.0"; + sha256 = "44520a3892dbefda790b3a44f2896a808db3a22751582ed41a0935f8b2b7544f"; + libraryHaskellDepends = [ + array async base binary bytestring containers cryptonite exceptions + lifted-async lifted-base memory monad-control monad-logger mtl + network QuickCheck random resourcet safe-exceptions stm text + transformers transformers-base vector + ]; + testHaskellDepends = [ + async base binary bytestring hspec monad-logger QuickCheck + transformers + ]; + homepage = "https://github.com/LTI2000/hinterface"; + description = "Haskell / Erlang interoperability library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinvaders" = callPackage ({ mkDerivation, base, haskell98, random }: mkDerivation { @@ -88145,18 +88353,19 @@ self: { }) {}; "hip" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-cairo, colour - , deepseq, filepath, JuicyPixels, netpbm, primitive, process, repa - , temporary, vector + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour + , deepseq, directory, filepath, hspec, JuicyPixels, netpbm + , primitive, process, QuickCheck, repa, temporary, vector }: mkDerivation { pname = "hip"; - version = "1.0.1.2"; - sha256 = "3fff4507cf53a979630d8e94d3dec05b18139007bc7e24ec122ce35d38292484"; + version = "1.1.0.2"; + sha256 = "86ff4302827f4d320efd2b574dee5f6383e41b330a38b1f5dca2a717973659f5"; libraryHaskellDepends = [ - base bytestring Chart Chart-cairo colour deepseq filepath - JuicyPixels netpbm primitive process repa temporary vector + base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process repa temporary vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; @@ -90611,8 +90820,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.5"; - sha256 = "d5b6f897ddd63f037ae9ce09c4f671e95a7f4331add3c09bd2bbd29114a89bb1"; + version = "5.0.6"; + sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92422,7 +92631,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {mesos = null; inherit (pkgs) protobuf;}; + }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -94239,6 +94448,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsoz" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, byteable, bytestring, case-insensitive + , containers, cryptonite, data-default, either, errors, http-client + , http-conduit, http-types, HUnit, lens, lucid, memory, mtl + , network, QuickCheck, scientific, scotty, securemem, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, uri-bytestring, vault, wai, warp, wreq + }: + mkDerivation { + pname = "hsoz"; + version = "0.0.0.3"; + sha256 = "5aa1d06f0fe3f2f38354d12af1f6205c15894d74e5a32ed743a4ce6602573781"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring byteable + bytestring case-insensitive containers cryptonite data-default + either errors http-client http-types lens memory mtl network + scientific scotty securemem text time transformers uri-bytestring + vault wai warp + ]; + executableHaskellDepends = [ + aeson base bytestring case-insensitive containers cryptonite + data-default http-client http-conduit http-types lens lucid scotty + text transformers uri-bytestring wai warp wreq + ]; + testHaskellDepends = [ + aeson base bytestring data-default http-client http-types HUnit + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text + time wai + ]; + homepage = "https://github.com/rvl/hsoz"; + description = "Iron, Hawk, Oz: Web auth protocols"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsp" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -96382,8 +96628,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.31.1"; - sha256 = "7032cd356bc5ddd5786b315271174ed510e1a190c4210bd65abe16201b86ce0c"; + version = "0.4.31.2"; + sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -100787,6 +101033,8 @@ self: { pname = "imperative-edsl"; version = "0.7"; sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7"; + revision = "1"; + editedCabalFile = "c7ce36becbcecf66151a8b850abb7a19752aa0dfd68922198dd53ed95470b57c"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -100822,27 +101070,34 @@ self: { "implicit" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg - , bytestring, containers, deepseq, directory, filepath, JuicyPixels - , mtl, NumInstances, optparse-applicative, parallel, parsec - , storable-endian, text, unordered-containers, vector-space + , bytestring, containers, criterion, deepseq, directory, download + , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances + , optparse-applicative, parallel, parsec, silently, snap-core + , snap-server, storable-endian, text, transformers + , unordered-containers, vector-space }: mkDerivation { pname = "implicit"; - version = "0.0.5"; - sha256 = "aa5a5de53ad25517a9ce044c21572f42262e537c848a81fd2be5b32c88d2fc9e"; - revision = "1"; - editedCabalFile = "9f5c887aaa0c834171243bf2acdc5e6234e124c3ee3f55c8c10ce37a7690500a"; + version = "0.1.0"; + sha256 = "f3120deca5f140e91ebf1af9ff035ca0a469024bd4e8855132aa24781f65d09b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-builder blaze-markup blaze-svg bytestring containers - deepseq directory filepath JuicyPixels mtl NumInstances - optparse-applicative parallel parsec storable-endian text - unordered-containers vector-space + criterion deepseq directory download filepath JuicyPixels monads-tf + NumInstances parallel parsec silently snap-core snap-server + storable-endian text transformers unordered-containers vector-space ]; - homepage = "https://github.com/colah/ImplicitCAD"; + executableHaskellDepends = [ + base blaze-builder blaze-markup blaze-svg bytestring containers + criterion deepseq directory filepath JuicyPixels monads-tf + optparse-applicative parallel parsec silently snap-core snap-server + storable-endian text transformers vector-space + ]; + testHaskellDepends = [ base containers hspec mtl parsec ]; + homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable"; description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; - license = "GPL"; + license = stdenv.lib.licenses.agpl3; }) {}; "implicit-logging" = callPackage @@ -103450,6 +103705,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "itemfield" = callPackage + ({ mkDerivation, base, brick, data-default, HUnit, microlens + , microlens-th, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vty + }: + mkDerivation { + pname = "itemfield"; + version = "1.2.0.0"; + sha256 = "a55b83a20a599c4acbba6aecc68db6d8de982f646c125f68bf0a48f6d4260716"; + revision = "1"; + editedCabalFile = "cefe94a562c871d018efedccd5246afd8a019463e4bb3e1e20d3b8d52939de17"; + libraryHaskellDepends = [ base brick microlens text vty ]; + testHaskellDepends = [ + base brick data-default HUnit microlens microlens-th QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + vty + ]; + description = "A brick Widget for selectable summary of many elements on a terminal"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iter-stats" = callPackage ({ mkDerivation, base, heap, HUnit, iteratee, ListLike, mtl , statistics, test-framework, test-framework-hunit @@ -104177,6 +104453,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "java-adt" = callPackage + ({ mkDerivation, alex, array, base, happy, pretty }: + mkDerivation { + pname = "java-adt"; + version = "0.2016.11.28"; + sha256 = "874de697e2bee902ba89b4527459eabbd8b6f6b3d63df1946ea22dfdad2092dc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base pretty ]; + executableToolDepends = [ alex happy ]; + homepage = "http://github.com/andreasabel/java-adt"; + description = "Create immutable algebraic data structures for Java"; + license = "unknown"; + }) {}; + "java-bridge" = callPackage ({ mkDerivation, base, bimap, containers, cpphs, directory , filepath, hinduce-missingh, hint, mtl, multimap, named-records @@ -104461,7 +104752,7 @@ self: { }) {}; "jni" = callPackage - ({ mkDerivation, base, bytestring, containers, inline-c, jvm + ({ mkDerivation, base, bytestring, containers, inline-c, jdk , singletons, thread-local-storage }: mkDerivation { @@ -104471,12 +104762,12 @@ self: { libraryHaskellDepends = [ base bytestring containers inline-c singletons thread-local-storage ]; - librarySystemDepends = [ jvm ]; + librarySystemDepends = [ jdk ]; homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {jvm = null;}; + }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -104724,8 +105015,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.7.0.0"; - sha256 = "0315258fbf5a1ce449de3df26d53de1d3e569ad4604bd17697983629fc183f82"; + version = "0.7.0.1"; + sha256 = "60581922dd1ccef07eb2319653d4b8448cbf65039c32680269277d731d0e95aa"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -105845,6 +106136,122 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kafka-device" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena + , mtl + }: + mkDerivation { + pname = "kafka-device"; + version = "0.1.5.0"; + sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal milena mtl + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal milena mtl + ]; + homepage = "https://bitbucket.org/functionally/kafka-device"; + description = "UI device events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-glut" = callPackage + ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }: + mkDerivation { + pname = "kafka-device-glut"; + version = "0.1.3.0"; + sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ]; + executableHaskellDepends = [ + base GLUT kafka-device milena OpenGL + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-glut"; + description = "GLUT events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-joystick" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , kafka-device, milena + }: + mkDerivation { + pname = "kafka-device-joystick"; + version = "0.1.5.0"; + sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-joystick"; + description = "Linux joystick events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-leap" = callPackage + ({ mkDerivation, aeson, base, hleap, kafka-device, milena + , websockets + }: + mkDerivation { + pname = "kafka-device-leap"; + version = "0.1.3.0"; + sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base hleap kafka-device milena websockets + ]; + executableHaskellDepends = [ + aeson base hleap kafka-device milena websockets + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-leap"; + description = "Leap Motion events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-spacenav" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , kafka-device, milena + }: + mkDerivation { + pname = "kafka-device-spacenav"; + version = "0.1.5.0"; + sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-spacenav"; + description = "Linux SpaceNavigator events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-vrpn" = callPackage + ({ mkDerivation, base, kafka-device, milena, vrpn }: + mkDerivation { + pname = "kafka-device-vrpn"; + version = "0.1.5.0"; + sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base kafka-device milena vrpn ]; + executableHaskellDepends = [ base kafka-device milena vrpn ]; + homepage = "https://bitbucket.org/functionally/kafka-device-vrpn"; + description = "VRPN events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + "kaleidoscope" = callPackage ({ mkDerivation, base, containers, haskeline, llvm-general , llvm-general-pure, mtl, parsec, transformers @@ -106045,14 +106452,14 @@ self: { , directory, either, exceptions, hostname, microlens, microlens-th , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa , resourcet, semigroups, string-conv, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , time, time-locale-compat, transformers, transformers-base + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , time-locale-compat, transformers, transformers-base , transformers-compat, unix, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.3.1.0"; - sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3"; + version = "0.3.1.2"; + sha256 = "d666b12f235c6eb5fa36fa1cfc5a48ec001996a4ad6e4abf5ff0601ee3d9cea5"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale @@ -106063,8 +106470,7 @@ self: { testHaskellDepends = [ aeson base bytestring directory microlens quickcheck-instances regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text time time-locale-compat - unordered-containers + template-haskell text time time-locale-compat unordered-containers ]; homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; @@ -106081,8 +106487,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.0"; - sha256 = "93aec808795efb6add91cd294f6612db8d0207f6192d6a518932484dca8a9a45"; + version = "0.3.0.1"; + sha256 = "92ad73f911363b879e7d8ba4b4249469ca7b6807f0469ca5648e64e38d5720d6"; libraryHaskellDepends = [ aeson async base bloodhound enclosed-exceptions exceptions http-client http-types katip retry scientific stm stm-chans text @@ -108030,8 +108436,8 @@ self: { }: mkDerivation { pname = "lambdacube-compiler"; - version = "0.6.0.0"; - sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423"; + version = "0.6.0.1"; + sha256 = "48e0869887cf6e01abe45e95f117c6bb2e50c4d1f0c23895a59438da19fad4e7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109344,8 +109750,8 @@ self: { }: mkDerivation { pname = "latex-formulae-image"; - version = "0.1.1.1"; - sha256 = "6c663420647282ec20c71421a2faf95629f2690283df4b9279ae53536cac3f61"; + version = "0.1.1.2"; + sha256 = "92f1fa3233eef7992a6fcae9fa240c6859e63ff09d7e89ca212017b974f29f0d"; libraryHaskellDepends = [ base directory errors filepath JuicyPixels process temporary transformers @@ -109362,8 +109768,8 @@ self: { }: mkDerivation { pname = "latex-formulae-pandoc"; - version = "0.2.0.3"; - sha256 = "289720149572814da30b9854b8a7b0798125c3fa3508b28ca53c9d382f65d12d"; + version = "0.2.0.4"; + sha256 = "76013ba9f4b9f1631ac347c026799b4a70bcb3b8a6e07038218befc5d0ec8332"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110129,6 +110535,8 @@ self: { pname = "lens"; version = "4.15.1"; sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; + revision = "2"; + editedCabalFile = "012be5e38b4fa0f4cb98ad04d6eb82a48eea6d789213a058b08fdc2e64aa1327"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -111733,8 +112141,8 @@ self: { }: mkDerivation { pname = "line"; - version = "1.0.0.1"; - sha256 = "f4cdfb7531f722143c20ee7a52655ec0a5c776777a45f9a9b653e2ff9910d9d6"; + version = "1.0.1.0"; + sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 http-types lens text time transformers wai wreq @@ -114626,8 +115034,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1.0.2"; - sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515"; + version = "0.1.0.3"; + sha256 = "a441ce9aa5d7eb13f5ec7cd4254f1827b17f729c166ec4c2b4eb4475a2fee20f"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -115298,6 +115706,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mackerel-client" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, data-default + , directory, filepath, hspec, htoml, http-client, http-client-tls + , http-types, parsec, raw-strings-qq, split, text + , unordered-containers + }: + mkDerivation { + pname = "mackerel-client"; + version = "0.0.2"; + sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1"; + revision = "1"; + editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030"; + libraryHaskellDepends = [ + aeson base bytestring data-default directory filepath htoml + http-client http-client-tls http-types parsec split text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base data-default hspec raw-strings-qq + unordered-containers + ]; + homepage = "https://github.com/itchyny/mackerel-client-hs"; + description = "An API client library for Mackerel"; + license = stdenv.lib.licenses.mit; + }) {}; + "maclight" = callPackage ({ mkDerivation, base, filemanip, filepath, HUnit , optparse-applicative, parsec, strict, test-framework @@ -116631,6 +117065,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_2_1_0" = callPackage + ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.2.1.0"; + sha256 = "f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb"; + libraryHaskellDepends = [ + base deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base deepseq erf HUnit primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-th-unbox + ]; + homepage = "https://github.com/bos/math-functions"; + description = "Special functions and Chebyshev polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -117105,15 +117562,13 @@ self: { }: mkDerivation { pname = "mdp"; - version = "0.1.0.0"; - sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711"; + version = "0.1.1.0"; + sha256 = "6e0e52f652dd969d5bfda6edf6519e6a0c38fa40994626820dc10c8a52aa4143"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers vector ]; - executableHaskellDepends = [ base containers vector ]; - testHaskellDepends = [ - base containers HTF HUnit QuickCheck vector - ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ base HTF HUnit QuickCheck vector ]; description = "Tools for solving Markov Decision Processes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -119958,6 +120413,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-syslog_0_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, fast-logger, hsyslog + , monad-logger, text, transformers + }: + mkDerivation { + pname = "monad-logger-syslog"; + version = "0.1.3.0"; + sha256 = "b35098f5d3a7ea9bcdda886a60b19c404618f36410011d7beaef07ee353383e3"; + libraryHaskellDepends = [ + base bytestring fast-logger hsyslog monad-logger text transformers + ]; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-loops" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -122997,6 +123469,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_13_5_0" = callPackage + ({ mkDerivation, base, primitive, time, vector }: + mkDerivation { + pname = "mwc-random"; + version = "0.13.5.0"; + sha256 = "28dd2d95d088438ab15e9dee45ddc500b6c4700a87539c70a48b1b7b4c8d1ca9"; + libraryHaskellDepends = [ base primitive time vector ]; + doCheck = false; + homepage = "https://github.com/bos/mwc-random"; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-monad" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random, primitive , transformers, vector @@ -123461,8 +123947,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.2.2"; - sha256 = "78992bb0c7b3f03633884512417674fbd9400298cf869b05d2d7ef9c9cdfe2f1"; + version = "0.1.3.0"; + sha256 = "bfb9ce8386eb72cb1e00b06632140629fc587128c0729dd85f29a022b5c82a06"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/namespace"; @@ -124360,6 +124846,8 @@ self: { pname = "netpbm"; version = "1.0.2"; sha256 = "846a04bca94be31c779888febc390c64cfba93e40f3a7a2f80ff6a6e44fcc2d7"; + revision = "1"; + editedCabalFile = "a0d0ed6bfda0c77c9842b627403392757df62d29aa0994124db6bfc2ca961cee"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox @@ -126915,10 +127403,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "0.0.7"; - sha256 = "bbd20049812fd481b882443341b17ad4b6b4e4766e7767130beb4f005786dabf"; - revision = "1"; - editedCabalFile = "957ab623269032edade4d4ea8c62761e7f35564e6a35dbcb825cbb3d05224bfd"; + version = "0.1.0"; + sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126953,8 +127439,8 @@ self: { }: mkDerivation { pname = "nvim-hs-contrib"; - version = "0.0.6"; - sha256 = "0825e32af7a9ee26a1f3d8104b2864208ac8142ce10c3f79516897cb5d12682d"; + version = "0.1.0"; + sha256 = "f0de17887d394301ec1975ab768ad6a6131bd7e6580b11c8b9364980e3be6472"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring data-default directory exceptions messagepack mtl nvim-hs parsec process resourcet setenv stm text @@ -127385,22 +127871,6 @@ self: { }) {}; "oeis" = callPackage - ({ mkDerivation, base, HTTP, HUnit, network, network-uri - , test-framework, test-framework-hunit - }: - mkDerivation { - pname = "oeis"; - version = "0.3.7"; - sha256 = "5d898a04d6117eca1250083cb8783d159302e9b5eb084878f5771916204861cf"; - libraryHaskellDepends = [ base HTTP network network-uri ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "oeis_0_3_8" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri , test-framework, test-framework-hunit }: @@ -127414,7 +127884,6 @@ self: { ]; description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "off-simple" = callPackage @@ -127857,32 +128326,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.2.1"; - sha256 = "ef175620163b6aaa5dc7aff6a49347b698134fb924869a789c097406ad746152"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_2_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset , postgresql-simple, pretty, product-profunctors, profunctors @@ -127906,7 +128349,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -128654,14 +129096,16 @@ self: { "opentype" = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc - , pretty-hex, time, vector + , microlens, microlens-th, mtl, pretty-hex, time + , unordered-containers, vector }: mkDerivation { pname = "opentype"; - version = "0.0.1"; - sha256 = "21c574b4af3c99607e1e647b52bd32a2ae644135ab55e3dc3041f6dd6f4f1340"; + version = "0.1.0"; + sha256 = "ff80076a81c6aec66347718f11fb7990a45c46e5719db185268007930ca46d6c"; libraryHaskellDepends = [ - base binary bytestring containers ghc pretty-hex time vector + base binary bytestring containers ghc microlens microlens-th mtl + pretty-hex time unordered-containers vector ]; description = "Opentype loading and writing"; license = stdenv.lib.licenses.bsd3; @@ -128706,6 +129150,8 @@ self: { pname = "operational-alacarte"; version = "0.3"; sha256 = "c9e6ebe251d0854ed71fcf10ea54af2489f6819e180c55d6f15cc1fe3cb5dfcc"; + revision = "1"; + editedCabalFile = "b8fa0a71719bbc82e750cab4dacede2ba752370169dd210f75c66e244ffb5ff8"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/operational-alacarte"; @@ -129999,7 +130445,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_1_18" = callPackage + "pandoc_1_19" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory @@ -130014,8 +130460,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.18"; - sha256 = "3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92"; + version = "1.19"; + sha256 = "227a5a70c8510e95f7dcc4dc1af3ebd9fb3efd252e5cbbda38aa1b9eb178f638"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -130081,6 +130527,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_10_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.10.3"; + sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath pandoc pandoc-types + process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -131412,8 +131892,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.4.0.0"; - sha256 = "1368b963c500cd2945ef7de890d337066ed99efab8565b1f8825febf4b5ee1b4"; + version = "0.4.2.0"; + sha256 = "bd2304d0f4dbc6e6533771c8a24e2103018ac7ea8d86de9bf45b503ca40aec97"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131465,8 +131945,8 @@ self: { }: mkDerivation { pname = "patches-vector"; - version = "0.1.5.2"; - sha256 = "aa19e7edb991e383672d58536351f63733359b0260902170c61c48e7196fec85"; + version = "0.1.5.4"; + sha256 = "f4c938988ad98883b98db10a32d4d544c39f98fc77b4e2c8da393718ef30da54"; libraryHaskellDepends = [ base edit-distance-vector microlens vector ]; @@ -134467,8 +134947,8 @@ self: { }: mkDerivation { pname = "pipes-key-value-csv"; - version = "0.4.0.0"; - sha256 = "1792858c4359a6c0ed9c685d422005c285853ac8382cb14390c2d00829ec427e"; + version = "0.4.0.1"; + sha256 = "940f5961dba5bfcc50f8e54e3263156cd80d73ee34730961eaa81b0f36f77734"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -138030,6 +138510,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "printcess" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, lens, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "printcess"; + version = "0.1.0.2"; + sha256 = "53907a189318381f5b6d77a15fa36eff274bc1f500f974dba060896d5d7e2418"; + libraryHaskellDepends = [ base containers lens mtl transformers ]; + testHaskellDepends = [ + base containers hspec HUnit lens mtl QuickCheck transformers + ]; + homepage = "https://github.com/m0rphism/printcess/"; + description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "printf-mauke" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , template-haskell @@ -139457,6 +139954,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_2_3" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.2.3"; + sha256 = "6d757c30f6fdc8df7ed62601f2b2530e71192109ab94d06dec4176c9c3eea6b5"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -139506,12 +140022,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161116" = callPackage + "publicsuffix_0_20161129" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161116"; - sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8"; + version = "0.20161129"; + sha256 = "419e1c5019b6c255087c88e27992d733a550442c40b8a58ee40e647cc76fb894"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -140338,6 +140854,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; + "pvss" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptonite + , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "pvss"; + version = "0.1"; + sha256 = "fa140bcc44158ae54a486668820c6b7c4b767ea702c5e687b064dcd386c0fc99"; + revision = "1"; + editedCabalFile = "2d6b823ed5c0e8852c2d91c248b09cabf83409fb71bd473ab15c44b30427dd0e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cryptonite cryptonite-openssl deepseq + integer-gmp memory + ]; + executableHaskellDepends = [ + base cryptonite deepseq hourglass memory + ]; + testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; + homepage = "https://github.com/input-output-hk/pvss-haskell#readme"; + description = "Public Verifiable Secret Sharing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pwstore-cli" = callPackage ({ mkDerivation, base, bytestring, cmdargs, HUnit, process , pwstore-fast, test-framework, test-framework-hunit, text @@ -142508,8 +143050,10 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.1"; - sha256 = "e1c3a65925f763519ef55d893b38c859db3a5386c6a8007e08dc941bc521f357"; + version = "0.2.1"; + sha256 = "7c188b8ffca38e8f63cfbff3555c8a8d29265262ada77c6e914c2e73859958fc"; + revision = "1"; + editedCabalFile = "193a7ca804a40c8b27c2962e39b914933ef7e69c6d1fb1aee7bbf954121df6f8"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -143314,28 +143858,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.0.3"; - sha256 = "366a0d4224d4f80da4e6bcd80ed0027a2895e0b4504e11448cad9e03c1a9f82d"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - homepage = "https://github.com/nikita-volkov/rebase"; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_0_6" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -143355,7 +143877,6 @@ self: { homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -146003,8 +146524,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.1"; - sha256 = "8cc418b668b575382ef5a977b06de3475c5ab92c3ed47174c94ef98bdbf13205"; + version = "1.0.1.1"; + sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -146628,26 +147149,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.4.1"; - sha256 = "d2791b0ea317655c3d5a5d9d1d443eeb66a31953e0a66ac7a510050c54d83fab"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers - ]; - homepage = "http://github.com/Soostone/retry"; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_7_4_2" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers }: @@ -146665,7 +147166,6 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -149392,8 +149892,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.0.0"; - sha256 = "7babbe1f9716ee17874f2c661285d5a384b8399e279288c6d1237b5f26d061b1"; + version = "2.1.0"; + sha256 = "4120efabc373ed18cf009ba8ca3961aca97b31bd0c347e748f2bfbf0e8d47519"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150243,6 +150743,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scotty-format" = callPackage + ({ mkDerivation, aeson, base, http-media, http-types, scotty, text + }: + mkDerivation { + pname = "scotty-format"; + version = "0.1.0.2"; + sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968"; + revision = "1"; + editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base http-media http-types scotty text ]; + executableHaskellDepends = [ aeson base scotty text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/potomak/scotty-format#readme"; + description = "Response format helper for the Scotty web framework"; + license = stdenv.lib.licenses.asl20; + }) {}; + "scotty-hastache" = callPackage ({ mkDerivation, base, containers, filepath, hastache, http-types , mtl, scotty, text, wai, warp @@ -151769,8 +152288,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.2.0"; - sha256 = "7dfa3165d4edb739c33e7d737b5655535ae28666f9d3886501ed623f28c6e15e"; + version = "0.1.2.1"; + sha256 = "585328969b7403c64b05eb05d908074d2742e40ce5d549d161c298d91a69f3db"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -151958,8 +152477,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.0.0"; - sha256 = "5743a4ac6da19e77c13d0ce02e95eff196932f789ae1bf73a711a1b2f0ed545c"; + version = "0.2.1.0"; + sha256 = "31c963fa9dcc39431d45edb0f859771cba74f0dc6229258205fac99f0572fb4a"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -151976,8 +152495,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.0.0"; - sha256 = "276fe75aefe7686729883186125a7931ed07a8a593fb59aeea1a71b8461a46f2"; + version = "0.2.1.0"; + sha256 = "61afe42548bf696d2a2d2ad89b6284a40c192a30bc9201f0f49529cd90d556fe"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -152056,8 +152575,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.0.0"; - sha256 = "8a4c47b9804b1d9d60304247d66315ae3d789597d979570e4783a161bc84ced9"; + version = "0.2.1.0"; + sha256 = "0bdce6889b1caf64e6b1ecbf565fb5201d32689c576bb3701cde671fbad8e3a1"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -152109,36 +152628,38 @@ self: { "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, cookie, crypto-api - , data-default-class, entropy, hspec, http-api-data, http-client - , http-types, jose, lens, lens-aeson, markdown-unlit, monad-time - , mtl, QuickCheck, servant-auth, servant-server, text, time - , transformers, unordered-containers, wai, warp, wreq + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, http-api-data + , http-client, http-types, jose, lens, lens-aeson, markdown-unlit + , monad-time, mtl, QuickCheck, servant-auth, servant-server, text + , time, transformers, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.0.0"; - sha256 = "e021d5fc4983eddd145fcb95e7f317534b7742fdf164b43d6735cbfe1412aa61"; + version = "0.2.1.0"; + sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy - http-api-data jose lens monad-time mtl servant-auth servant-server - text time unordered-containers wai + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens monad-time mtl + servant-auth servant-server text time unordered-containers wai ]; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy - http-api-data jose lens markdown-unlit monad-time mtl servant-auth - servant-server text time transformers unordered-containers wai warp + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens markdown-unlit + monad-time mtl servant-auth servant-server text time transformers + unordered-containers wai warp ]; testHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy hspec - http-api-data http-client http-types jose lens lens-aeson - monad-time mtl QuickCheck servant-auth servant-server text time - unordered-containers wai warp wreq + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy hspec http-api-data http-client + http-types jose lens lens-aeson monad-time mtl QuickCheck + servant-auth servant-server text time unordered-containers wai warp + wreq ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; @@ -157072,16 +157593,15 @@ self: { "snap-cors" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , hashable, network, network-uri, snap, text, transformers - , unordered-containers + , hashable, network, network-uri, snap, text, unordered-containers }: mkDerivation { pname = "snap-cors"; - version = "1.2.10"; - sha256 = "57304a8fa66584fb0d7cd5d7b64feaa8c4a9d15e8f753ff80f1cd2d5e092b637"; + version = "1.2.11"; + sha256 = "81bd318b871c08a25bdcb05b286b43e99865b2ea21a4eb48b6e9839362acaf34"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive hashable network - network-uri snap text transformers unordered-containers + network-uri snap text unordered-containers ]; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; @@ -158421,30 +158941,6 @@ self: { }) {}; "soap" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.1"; - sha256 = "a9cad8d48dfe6674b836e017ba0d1cf80d78f55e543e0bf58d07e5656a6c1c39"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "soap_0_2_3_2" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit , iconv, mtl, resourcet, text, unordered-containers, xml-conduit @@ -158466,7 +158962,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -159915,8 +160410,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.91.0"; - sha256 = "cfa966eddf2336a000d26cf6d4234529dddabeb8d87cadd51e7a5d2e5e794738"; + version = "1.92.0"; + sha256 = "8f93a7d03db1508a2a7e53998edef027a00f75d33a1532113e56a651dc6e3f9e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160110,6 +160605,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_12_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text + , time, transformers + }: + mkDerivation { + pname = "sqlite-simple"; + version = "0.4.12.0"; + sha256 = "eb5732bea0fff46a1761c5aa635533c7200c748624825440276774ce4bf56093"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-textual bytestring containers + direct-sqlite text time transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring direct-sqlite HUnit text time + ]; + homepage = "http://github.com/nurpax/sqlite-simple"; + description = "Mid-Level SQLite client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -160806,6 +161323,52 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-curator_0_14_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async + , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal + , classy-prelude-conduit, conduit, conduit-extra, containers + , cryptohash, cryptohash-conduit, data-default-class, directory + , exceptions, filepath, hashable, hspec, html-conduit, http-client + , http-client-tls, http-conduit, lucid, mime-types, monad-unlift + , monad-unlift-ref, mono-traversable, mtl, old-locale + , optparse-applicative, optparse-simple, process, QuickCheck + , resourcet, safe, semigroups, stm, store, streaming-commons, syb + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, unordered-containers, utf8-string + , vector, xml-conduit, xml-types, yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.14.3"; + sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 async base + base16-bytestring blaze-html byteable bytestring Cabal + classy-prelude-conduit conduit conduit-extra containers cryptohash + cryptohash-conduit data-default-class directory exceptions filepath + hashable html-conduit http-client http-client-tls http-conduit + lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl + old-locale process resourcet safe semigroups stm store + streaming-commons syb system-fileio system-filepath tar temporary + text time transformers unix-compat unordered-containers utf8-string + vector xml-conduit xml-types yaml zlib + ]; + executableHaskellDepends = [ + aeson base http-client http-client-tls optparse-applicative + optparse-simple system-filepath text + ]; + testHaskellDepends = [ + base Cabal classy-prelude-conduit containers directory hspec + http-client http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage-curator"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage-install" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , cryptohash, directory, filepath, http-client, http-client-tls @@ -162006,14 +162569,14 @@ self: { "stompl" = callPackage ({ mkDerivation, attoparsec, base, bytestring, mime, split, text - , utf8-string + , utf8-string, word8 }: mkDerivation { pname = "stompl"; - version = "0.3.0"; - sha256 = "52897d2b5f0f100d76e1b8ae0d243102b712f6c760cda103146618e11007e5c6"; + version = "0.4.0"; + sha256 = "8766eec4d48e44d08fbcb009f9d3098ba1b10193caac14935b2c0c1889ae0d7d"; libraryHaskellDepends = [ - attoparsec base bytestring mime split text utf8-string + attoparsec base bytestring mime split text utf8-string word8 ]; homepage = "http://github.com/toschoo/mom"; description = "Stomp Parser and Utilities"; @@ -163386,15 +163949,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stylish-haskell_0_6_4_0" = callPackage + "stylish-haskell_0_6_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.6.4.0"; - sha256 = "7f8aba23c7409350c59fdc836eedc4ab71e179bd5eed7e1b828178ef89bc6676"; + version = "0.6.5.0"; + sha256 = "aeee182f8b6a9492eedd12a45cd9a4abb677e95e1789ddd8681e699f27a5ea78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163734,8 +164297,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.3.0.0"; - sha256 = "772a27569ab8d2bf00c67b2ab07581cd135ee2a5e129fbf9a46ff2e1a222269e"; + version = "0.3.1.0"; + sha256 = "9daf90541bbb17621d0a0c4993f9601bffcbb1452d862c990f5bf147afaab3ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163754,6 +164317,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superbuffer" = callPackage + ({ mkDerivation, base, bytestring, HTF, QuickCheck }: + mkDerivation { + pname = "superbuffer"; + version = "0.1.0.0"; + sha256 = "85d6e38f100ec5847067f569f964e1bbf04df58b001275b70589d58191be2105"; + revision = "1"; + editedCabalFile = "162970f213762fe4be50f554d52e2500150fa400cff70e8069127a84c50dfb4a"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring HTF QuickCheck ]; + homepage = "https://github.com/agrafix/superbuffer#readme"; + description = "Efficiently build a bytestring from smaller chunks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -164536,6 +165114,8 @@ self: { pname = "syntactic"; version = "3.6.2"; sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73"; + revision = "1"; + editedCabalFile = "48bee990f011eaa13392605459eb15eaa5d63d798cd8b50ec293a4430f4266d3"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -167605,6 +168185,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_0_0" = callPackage + ({ mkDerivation, base, data-default, haskell-src-exts + , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell + , th-orphans, th-to-exp, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.0.0"; + sha256 = "084877f777878d2cabfb661e957dd8f5517000650c120308f8e2dbe7eda6772d"; + libraryHaskellDepends = [ + base data-default haskell-src-exts haskell-src-meta mtl + template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell th-to-exp + transformers + ]; + homepage = "http://github.com/cjdev/test-fixture#readme"; + description = "Test monadic side-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -168141,6 +168744,28 @@ self: { license = "GPL"; }) {}; + "texmath_0_9" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.9"; + sha256 = "6ee9cda09fd38b27309abf50216ae2081543c0edf939f71cc3856feca24c5f2c"; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -172063,30 +172688,6 @@ self: { }) {}; "transient-universe" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, iproute, mtl, network - , network-info, network-uri, process, random, stm, TCache, text - , time, transformers, transient, vector, websockets - }: - mkDerivation { - pname = "transient-universe"; - version = "0.3.5"; - sha256 = "0a990737a635cad37e7530eb1abe295df7b72b24a066fd2891d943bf4a92bbfb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP iproute mtl network network-info network-uri process - random stm TCache text time transformers transient vector - websockets - ]; - executableHaskellDepends = [ base transformers transient ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Remote execution and map-reduce: distributed computing for Transient"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient-universe_0_3_5_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network , network-info, network-uri, process, random, stm, TCache, text @@ -172113,7 +172714,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translatable-intset" = callPackage @@ -172274,6 +172874,8 @@ self: { pname = "tree-view"; version = "0.5"; sha256 = "2d0046df6a78bfc57c7d11736d3baf6e1e427e8eb944f408b80a9195b062dcab"; + revision = "1"; + editedCabalFile = "85fbc67b53c1ef47f020a69051e6a29b27481698fe802cd2ed8ab0108aa69a38"; libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = stdenv.lib.licenses.bsd3; @@ -172433,32 +173035,6 @@ self: { }) {}; "trifecta" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.6"; - sha256 = "b302a69295fcb70f645e48b5005ded4f62a05ae11e4470f20ff4cc136ada7065"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "trifecta_1_6_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset , comonad, containers, deepseq, directory, doctest, filepath @@ -172482,7 +173058,6 @@ self: { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trimpolya" = callPackage @@ -173746,6 +174321,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-assertions" = callPackage + ({ mkDerivation, base, hspec, test-fixture }: + mkDerivation { + pname = "type-assertions"; + version = "0.1.0.0"; + sha256 = "aac74571c99fa0170970716385570cf0e0bbb18fc93f1d7ad372824fe7a679bb"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec test-fixture ]; + homepage = "https://github.com/lexi-lambda/type-assertions#readme"; + description = "Runtime type assertions for testing"; + license = stdenv.lib.licenses.isc; + }) {}; + "type-booleans" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -174625,26 +175213,6 @@ self: { }) {}; "ua-parser" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, derive - , file-embed, filepath, HUnit, pcre-light, tasty, tasty-hunit - , tasty-quickcheck, text, yaml - }: - mkDerivation { - pname = "ua-parser"; - version = "0.7.1"; - sha256 = "bfcfe7ea0cbeade0053dbdbbc8f4593283d17403058d754b00430edb1a0444b4"; - libraryHaskellDepends = [ - aeson base bytestring data-default file-embed pcre-light text yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default derive file-embed filepath HUnit - pcre-light tasty tasty-hunit tasty-quickcheck text yaml - ]; - description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ua-parser_0_7_2" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, file-embed , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck , text, yaml @@ -174662,7 +175230,6 @@ self: { ]; description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uacpid" = callPackage @@ -176424,29 +176991,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, derive, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.2.0"; - sha256 = "d7ab6d08e4c0b0ef2ed6ae47ec839cbc39734ea31af3178ce66a0b6896d14f0d"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers derive HUnit - lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_2_2_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, generics-sop, HUnit, lens-simple, QuickCheck , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -176467,7 +177011,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -177531,26 +178074,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.3"; - sha256 = "481e01f8213e09d8b4a45f27e58921fe7da40a2b6ce15f0220d4efe210118f13"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "validation_0_5_4" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups , template-haskell, transformers @@ -177568,7 +178091,6 @@ self: { homepage = "https://github.com/NICTA/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -181806,16 +182328,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_10_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers, entropy + , HUnit, network, QuickCheck, random, SHA, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.10.0.0"; + sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy HUnit network QuickCheck random + SHA test-framework test-framework-hunit test-framework-quickcheck2 + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-snap" = callPackage - ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core - , snap-server, websockets + ({ mkDerivation, base, bytestring, bytestring-builder, io-streams + , mtl, snap-core, snap-server, websockets }: mkDerivation { pname = "websockets-snap"; - version = "0.10.0.0"; - sha256 = "092328966679e2f2761acc06ab4236297e61eff8a2e8087470b6962238daf4fe"; + version = "0.10.2.0"; + sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2"; libraryHaskellDepends = [ - base bytestring io-streams mtl snap-core snap-server websockets + base bytestring bytestring-builder io-streams mtl snap-core + snap-server websockets ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; @@ -181939,6 +182489,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wembley" = callPackage + ({ mkDerivation, base, bytestring, filemanip, filepath + , optparse-applicative, split + }: + mkDerivation { + pname = "wembley"; + version = "0.1.0.0"; + sha256 = "608b999e650552af2f922611511d612da491c28d56900cf8a4a7e3458c49d510"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring filemanip filepath optparse-applicative split + ]; + homepage = "https://github.com/lovasko/wembley"; + description = "Pretty-printing of codebases"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "werewolf" = callPackage ({ mkDerivation, aeson, base, containers, directory, extra , filepath, interpolate, lens, MonadRandom, mtl @@ -182128,23 +182696,6 @@ self: { }) {}; "wikicfp-scraper" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec - , scalpel, text, time - }: - mkDerivation { - pname = "wikicfp-scraper"; - version = "0.1.0.5"; - sha256 = "0a34feeaf03f5f98ebb4c43c9d711323814c0148e062f2eebacb524f489769ee"; - libraryHaskellDepends = [ - attoparsec base bytestring scalpel text time - ]; - testHaskellDepends = [ base bytestring filepath hspec time ]; - homepage = "https://github.com/debug-ito/wikicfp-scraper"; - description = "Scrape WikiCFP web site"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wikicfp-scraper_0_1_0_6" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel, text, time }: @@ -182159,7 +182710,6 @@ self: { homepage = "https://github.com/debug-ito/wikicfp-scraper"; description = "Scrape WikiCFP web site"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wikipedia4epub" = callPackage @@ -182487,6 +183037,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-annotated" = callPackage + ({ mkDerivation, base, containers, deepseq, HUnit, semigroups + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "wl-pprint-annotated"; + version = "0.0.1.2"; + sha256 = "7fa75ad09c60f72fa75430c862667847cd83fa4c9e912bf86b00f3eed6a4af33"; + libraryHaskellDepends = [ + base containers deepseq semigroups text + ]; + testHaskellDepends = [ + base containers deepseq HUnit semigroups test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/minad/wl-pprint-annotated#readme"; + description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wl-pprint-ansiterm" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl , nats, semigroups, text, transformers, wl-pprint-extras @@ -182505,6 +183075,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wl-pprint-console" = callPackage + ({ mkDerivation, base, console-style, mtl, text + , wl-pprint-annotated + }: + mkDerivation { + pname = "wl-pprint-console"; + version = "0.0.1.2"; + sha256 = "dbef55503890a3d60c318084f2e857feba4529d458a17629f4ad00f13084ab3a"; + revision = "2"; + editedCabalFile = "560613daa268b1755476619a69dc7d343a52513b6bf2789ba25523afe9708917"; + libraryHaskellDepends = [ + base console-style mtl text wl-pprint-annotated + ]; + homepage = "https://github.com/minad/wl-pprint-console#readme"; + description = "Wadler/Leijen pretty printer supporting colorful console output"; + license = stdenv.lib.licenses.mit; + }) {}; + "wl-pprint-extras" = callPackage ({ mkDerivation, base, containers, HUnit, nats, semigroupoids , semigroups, test-framework, test-framework-hunit, text @@ -183119,23 +183707,6 @@ self: { }) {}; "writer-cps-mtl" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; - version = "0.1.0.2"; - sha256 = "b77e45607d7bfde15758ae5223f79d846dc6adc7ab73b0d0b0df422daa1c7fce"; - revision = "1"; - editedCabalFile = "6c3b908440ba1217cb4b9724d5f3835ee370578b491c58f219e31193f36f9422"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - homepage = "https://github.com/minad/writer-cps-mtl#readme"; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_0" = callPackage ({ mkDerivation, base, mtl, transformers, writer-cps-transformers }: mkDerivation { @@ -183148,24 +183719,9 @@ self: { homepage = "https://github.com/minad/writer-cps-mtl#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "writer-cps-transformers"; - version = "0.1.0.2"; - sha256 = "037e74cb6c2780f151d937e15560a26c59c824f14c2c8f169971c76fcbd1dd4d"; - revision = "1"; - editedCabalFile = "07137b0cb53028a4025ed02c85863c91a3e6256f0f506261ec129ac347d9c619"; - libraryHaskellDepends = [ base transformers ]; - homepage = "https://github.com/minad/writer-cps-transformers#readme"; - description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-transformers_0_1_1_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; @@ -183175,7 +183731,6 @@ self: { homepage = "https://github.com/minad/writer-cps-transformers#readme"; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wsdl" = callPackage @@ -183342,6 +183897,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.3"; + sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + homepage = "https://github.com/tfausak/wuss#readme"; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -185694,6 +186265,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_21_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , semigroups, template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.21.1"; + sha256 = "f9f8e801a215c65cf5eff6e3aa384060e60232521630495d13573bf0677a0db2"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific semigroups + template-haskell text transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet temporary text transformers + unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-config" = callPackage ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty , tasty-quickcheck, text, unordered-containers, yaml @@ -186116,8 +186719,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "0.3.0.3"; - sha256 = "b405093850400d551cc9d443cedcd28e7b0ff4b9e724ee00d4b21c4852d80f0b"; + version = "1.0.0.1"; + sha256 = "c535ab7797d2ad062a351f688d147908d79770c1e0881e4340c9d8ab25307bfc"; libraryHaskellDepends = [ base containers filepath HDBC parsec template-haskell ]; @@ -186219,6 +186822,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_14" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.14"; + sha256 = "44f5c8c4f1c129fd8552d583679bb848b54ab3ed81e86e7038edaf8996a6ca85"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -186593,6 +187226,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, safe-exceptions, say, shakespeare, split, stm + , streaming-commons, tar, template-haskell, text, time + , transformers, transformers-compat, typed-process, unix-compat + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.5.0.1"; + sha256 = "5530506d1ddbe0b846f538b366645c416322046aa712d866c422e4778829d3e8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + safe-exceptions say shakespeare split stm streaming-commons tar + template-haskell text time transformers transformers-compat + typed-process unix-compat unordered-containers wai wai-extra warp + warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate @@ -186730,6 +187398,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_28" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, deepseq-generics, directory, exceptions + , fast-logger, hspec, hspec-expectations, http-types, HUnit + , lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.28"; + sha256 = "f544294deb9f9ac499885b6978d64a9467213908d19b6af6a4c46846d1990186"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -187763,6 +188472,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_5_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, containers, cookie + , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base + , monad-control, network, persistent, pretty-show, text, time + , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.5.4"; + sha256 = "c8b69211a49939fa74e3d799626487dcc358213896eec6e887f3051843b7a17a"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive containers cookie hspec-core html-conduit + http-types HUnit monad-control network persistent pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit + lifted-base text wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -187880,6 +188617,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_2_4_1" = callPackage + ({ mkDerivation, async, base, conduit, enclosed-exceptions + , monad-control, transformers, wai, wai-websockets, websockets + , yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.2.4.1"; + sha256 = "795b497217dece919d4034bc4dfa84632d900798d1be9a423ce57409378cbccf"; + libraryHaskellDepends = [ + async base conduit enclosed-exceptions monad-control transformers + wai wai-websockets websockets yesod-core + ]; + homepage = "https://github.com/yesodweb/yesod"; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets From 880ae3fd1ebbe3e0d629936449c82c5a55dd2346 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 29 Nov 2016 01:03:29 +0800 Subject: [PATCH 192/219] haskellPackages: fix brick and vty_5_13 brick 0.14 requires vty >= 5.12 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b3a16de26d..22416389040 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -494,6 +494,7 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; + vty_5_13 = dontCheck super.vty_5_13; # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -1121,4 +1122,8 @@ self: super: { # https://github.com/philopon/barrier/issues/3 barrier = doJailbreak super.barrier; + + # requires vty 5.13 + brick = super.brick.overrideScope (self: super: { vty = self.vty_5_13; }); + } From a571edecd089758c365f49803f851e46d3dcefb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2016 19:52:16 +0100 Subject: [PATCH 193/219] haskell-jni: fix path to missing libjvm libjvm.so is in a non-standard location and the build needs help finding it. Closes https://github.com/NixOS/nixpkgs/issues/20669. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 22416389040..766f7f793b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -76,6 +76,14 @@ self: super: { ''; }); + # jni needs help finding libjvm.so because it's in a weird location. + jni = overrideCabal super.jni (drv: { + preConfigure = '' + local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" ) + configureFlags+=" --extra-lib-dir=''${libdir[0]}" + ''; + }); + # The package doesn't know about the AL include hierarchy. # https://github.com/phaazon/al/issues/1 al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; From 297ea7550caa2f27dbdde17c526350e148c6be79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2016 20:01:35 +0100 Subject: [PATCH 194/219] haskellPackages.ghc-core: Revert "0.5.6 -> 2012-12-15" This reverts commit c1b919ff5c13103017e750fb6a7a1dfdeaf23394. That kind of change is a maintenance nightmare because it unconditionally overrides the package's version specified in hackage-packages.nix with something else, i.e. no future update will ever have an effect. This is not the proper way to do it. The proper way is to add the relevant commit from Github as a patch. --- .../haskell-modules/configuration-common.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 766f7f793b5..4f9c32a1414 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1113,17 +1113,6 @@ self: super: { socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); - # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R" - ghc-core = overrideCabal super.ghc-core (drv: { - src = pkgs.fetchFromGitHub { - owner = "shachaf"; - repo = "ghc-core"; - rev = "630196adf0bebf073328325302453ef1c409fd9a"; - sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848"; - }; - version = "2012-12-15"; - }); - # Encountered missing dependencies: hspec >=1.3 && <2.1 # https://github.com/rampion/ReadArgs/issues/8 ReadArgs = doJailbreak super.ReadArgs; From bfc2721ebf08a414f0268e9f4913a563a6b86999 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 1 Dec 2016 20:41:14 +0100 Subject: [PATCH 195/219] pythonPackages.docker: Fix build for python3 --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09f35be2798..d2f63239eed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6079,13 +6079,16 @@ in { docker = buildPythonPackage rec { name = "docker-py-${version}"; version = "1.10.6"; - disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; }; + buildInputs = [ + pkgs.glibcLocales + ]; + propagatedBuildInputs = with self; [ six requests2 @@ -6098,6 +6101,8 @@ in { # Version conflict doCheck = false; + LC_ALL="en_US.UTF-8"; + meta = { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; From d69a25dfdedef3a8001f286bd7b0cecebe7c68e6 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 1 Dec 2016 20:42:27 +0100 Subject: [PATCH 196/219] pythonPackages.docker: Add myself as a maintainer --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2f63239eed..9044288bad6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6107,6 +6107,9 @@ in { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; license = licenses.asl20; + maintainers = with maintainers; [ + jgeerds + ]; }; }; From 49a313c395006ede63850f42c3887d2e1446b43a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:32:39 +0100 Subject: [PATCH 197/219] pythonpackages.lti: rename to PyLTI and remove overriding - rename to PyLTI to follow upstream - remove overriding because it is not necessary; newer mock can be used, and modules python packages should be fixed to not propagate pytest (see separate commit). cc maintainer @layus --- pkgs/servers/inginious/default.nix | 2 +- pkgs/top-level/python-packages.nix | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index c85d96100c3..113b297787b 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -38,7 +38,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ requests2 - cgroup-utils docker_1_7_2 docutils lti mock pygments + cgroup-utils docker_1_7_2 docutils PyLTI mock pygments pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib websocket_client watchdog webpy-custom flup ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9044288bad6..201c34f3a9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7981,26 +7981,21 @@ in { }; }; - lti = let - self' = (self.override {self = self';}) // {pytest = self.pytest_27;}; - mock_1_0_1 = self'.mock.overrideDerivation (_: rec { - name = "mock-1.0.1"; - propagatedBuildInputs = null; - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; - sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"; - }; - }); - in buildPythonPackage rec { + PyLTI = buildPythonPackage rec { version = "0.4.1"; name = "PyLTI-${version}"; disabled = !isPy27; + # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48 + postPatch = '' + substituteInPlace setup.py --replace "mock==1.0.1" "mock" + ''; + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; - buildInputs = with self'; [ + buildInputs = with self; [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock_1_0_1 + pytestflakes pytestpep8 sphinx mock ]; src = pkgs.fetchurl { From d3f3ad3b26d4c9737f8e4f9a4d251aa49023a17e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:34:57 +0100 Subject: [PATCH 198/219] pythonPackages.pyjwt: does not need pytest 2.7 --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 201c34f3a9a..7c70d76b065 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20284,9 +20284,14 @@ in { sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn"; }; - buildInputs = with self; [ pytestrunner pytestcov pytest_27 coverage ]; + buildInputs = with self; [ pytestrunner pytestcov pytest coverage ]; propagatedBuildInputs = with self; [ pycrypto ecdsa ]; + # We don't need this specific version + postPatch = '' + substituteInPlace setup.py --replace "pytest==2.7.3" "pytest" + ''; + meta = { description = "JSON Web Token implementation in Python"; longDescription = "A Python implementation of JSON Web Token draft 01"; From a8379a19069d54253afe60dde8d47f71eff6557b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:35:41 +0100 Subject: [PATCH 199/219] pythonPackages.pytestcache: disable tests --- pkgs/top-level/python-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c70d76b065..9b65ab312e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4906,7 +4906,15 @@ in { sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; }; - propagatedBuildInputs = with self ; [ pytest execnet ]; + buildInputs = with self; [ pytest]; + propagatedBuildInputs = with self ; [ execnet ]; + + checkPhase = '' + py.test + ''; + + # Too many failing tests. Are they maintained? + doCheck = false; meta = { license = licenses.mit; From be020a25826be05518214061fa5396ed101ceb94 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:37:15 +0100 Subject: [PATCH 200/219] pythonPackages: do not propagate pytest pytest plugins should not propagate pytest. Instead, packages depending on pytest and plugins, should explicitly depend on both the plugin(s) and pytest. This change will more easily allow packages to depend on another version of pytest when needed. --- pkgs/top-level/python-packages.nix | 51 +++++++++++++++++++----------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b65ab312e0..bd6e74c6a64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1541,6 +1541,7 @@ in { sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; + # Why does it propagate packages that are used for testing? propagatedBuildInputs = with self; [ configobj prompt_toolkit awscli boto3 pygments mock pytest pytestcov unittest2 tox @@ -4936,7 +4937,8 @@ in { # pytest's binaries pytest = self.pytest; - propagatedBuildInputs = with self; [ django pytest setuptools_scm_18 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ django setuptools_scm_18 ]; meta = { description = "py.test plugin for testing of Django applications"; @@ -4955,7 +4957,8 @@ in { sha256 = "7d7cc1cb25f88a707f083b1dc2e3c2fdfc6f37709567a2587dd0cd0bcd70edb6"; }; - propagatedBuildInputs = with self; [ pytest coverage virtualenv pytestcov six ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ coverage virtualenv pytestcov six ]; checkPhase = '' py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" @@ -4980,7 +4983,7 @@ in { sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; }; - propagatedBuildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest ]; checkPhase = '' py.test @@ -5004,7 +5007,12 @@ in { sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a"; }; - propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; + buildInputs = with self; [ pytestpep8 pytest ]; + propagatedBuildInputs = with self; [ pyflakes pytestcache ]; + + checkPhase = '' + py.test test_flakes.py + ''; meta = { license = licenses.mit; @@ -5018,7 +5026,8 @@ in { pname = "pytest-mock"; version = "1.2"; - propagatedBuildInputs = with self; [ mock pytest ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ mock ]; meta = { description = "Thin-wrapper around the mock package for easier use with py.test."; @@ -5041,7 +5050,8 @@ in { sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; }; - propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ pytestcache pep8 ]; meta = { license = licenses.mit; @@ -5059,7 +5069,8 @@ in { sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk"; }; - propagatedBuildInputs = with self ; [ pytest pep257 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self ; [ pep257 ]; meta = { homepage = https://github.com/anderslime/pytest-pep257; @@ -5121,7 +5132,8 @@ in { sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3"; }; - propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ pytestflakes pytestpep8 tox ]; meta = { license = licenses.asl20; @@ -5135,6 +5147,7 @@ in { pname = "pytest-server-fixtures"; version = "1.1.0"; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests2 ]; meta = { @@ -5161,8 +5174,8 @@ in { url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4"; }; - buildInputs = with self; [ cmdline ]; - propagatedBuildInputs = with self; [ pytest pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; + buildInputs = with self; [ cmdline pytest ]; + propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; meta = { description = "A goodie-bag of unix shell and environment tools for py.test"; homepage = https://github.com/manahl/pytest-plugins; @@ -5209,8 +5222,8 @@ in { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669"; }; - buildInputs = with self; [ pytestcov mock cmdline ]; - propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil pytest ]; + buildInputs = with self; [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; checkPhase = '' py.test tests/unit ''; meta = { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; @@ -5270,7 +5283,7 @@ in { sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; }; - propagatedBuildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest ]; # no upstream test doCheck = false; @@ -7676,8 +7689,8 @@ in { sed 's/==/>=/' -i setup.py ''; - propagatedBuildInputs = with self; [ six clint pyyaml docopt pytest - requests2 jsonpatch args ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ six clint pyyaml docopt requests2 jsonpatch args ]; meta = with stdenv.lib; { description = "A python wrapper for the various Internet Archive APIs"; @@ -8002,7 +8015,7 @@ in { propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; buildInputs = with self; [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore pytestflakes pytestpep8 sphinx mock ]; @@ -10341,7 +10354,8 @@ in { sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc"; }; - propagatedBuildInputs = with self; [ django pytest ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "Efficient tree implementations for Django 1.6+"; @@ -10996,8 +11010,7 @@ in { sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41"; }; - propagatedBuildInputs = with self; [ pytest ]; - buildInputs = with self; [ mock ]; + buildInputs = with self; [ mock pytest ]; # waiting for feedback https://github.com/box/flaky/issues/97 doCheck = false; From 74276caf194ac9a1398cf164ec6604c3730f75a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:36:38 +0100 Subject: [PATCH 201/219] koji -> pythonPackages.koji koji is both a library and an application. It is used in Nixpkgs primarily as a library and therefore I move it. --- .../python-modules}/koji/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 4 +++- 3 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/{tools/package-management => development/python-modules}/koji/default.nix (72%) diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/development/python-modules/koji/default.nix similarity index 72% rename from pkgs/tools/package-management/koji/default.nix rename to pkgs/development/python-modules/koji/default.nix index 7d2022ee91b..262ea74d4a3 100644 --- a/pkgs/tools/package-management/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, mkPythonDerivation, pycurl }: -let - pythonEnv = python2.withPackages(ps : [ps.pycurl]); -in stdenv.mkDerivation rec { +mkPythonDerivation rec { name = "koji-1.8"; src = fetchurl { @@ -10,11 +8,12 @@ in stdenv.mkDerivation rec { sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; }; - propagatedBuildInputs = [ pythonEnv ]; + propagatedBuildInputs = [ pycurl ]; makeFlags = "DESTDIR=$(out)"; postInstall = '' + mv $out/usr/* $out/ cp -R $out/nix/store/*/* $out/ rm -rf $out/nix ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad0b6c8031..69790130efc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13575,8 +13575,6 @@ in stdenv = overrideCC stdenv gcc49; }; - koji = callPackage ../tools/package-management/koji { }; - konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { }; krita = qt5.callPackage ../applications/graphics/krita { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd6e74c6a64..8eaa75fb69d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13338,7 +13338,9 @@ in { homepage = "https://github.com/twisted/klein"; license = licenses.mit; }; - }; + }; + + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { name = "kombu-${version}"; From 19ca20c91f56b47b194039781145f0cba9a2ddc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:39:51 +0100 Subject: [PATCH 202/219] pythonPackages.rpm: rpm for specific python version rpm provides a Python module that is used by certain packages. We need to override pkgs.rpm to get a correct version. --- pkgs/tools/misc/diffoscope/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4d5eabfebc9..c6eb7c8b018 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc -, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz +, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz , enableBloat ? false }: @@ -29,9 +29,9 @@ pythonPackages.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ + propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++ map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz + gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69790130efc..564e52777f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1430,7 +1430,6 @@ in diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk7; pythonPackages = python3Packages; - rpm = rpm.override { python = python3; }; }; diffstat = callPackage ../tools/text/diffstat { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eaa75fb69d..06bad487f8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22454,6 +22454,8 @@ in { }); + rpm = (pkgs.rpm.override{inherit python;}); + rpy2 = buildPythonPackage rec { name = "rpy2-2.8.2"; disabled = isPyPy; From 13017d8ba6ac90837e4ec73c372f236a3b4d12fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:40:34 +0100 Subject: [PATCH 203/219] pythonPackages.rpkg: use local rpm and koji --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06bad487f8e..b1c2bdd0521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22439,7 +22439,7 @@ in { rpkg = buildPythonPackage (rec { name = "rpkg-1.14"; - disabled = !isPy27; + disabled = !isPy27; # error: invalid command 'bdist_wheel' meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { @@ -22449,8 +22449,8 @@ in { patches = [ ../development/python-modules/rpkg-buildfix.diff ]; - propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git - pkgs.rpm pyopenssl ]; + propagatedBuildInputs = with self; [ pycurl koji GitPython pkgs.git + rpm pyopenssl ]; }); From 8b5544bea26f320c13626a03893be0ed265a4305 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:06:19 +0100 Subject: [PATCH 204/219] pythonPackages.pynzb: disable tests --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1c2bdd0521..66dbdcd611d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20746,6 +20746,12 @@ in { sha256 = "0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17"; }; + # Can't get them working + doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest -s pynzb -t . + ''; + meta = { homepage = http://github.com/ericflo/pynzb; description = "Unified API for parsing NZB files"; From 2dba67fbb7da79905e7c865fe70d73a6e034e373 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:13:26 +0100 Subject: [PATCH 205/219] pythonPackages.webassets: disable tests Test invocation was broken. Now that is fixed, but getting the tests to pass requires more work. --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66dbdcd611d..1777dbad636 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26043,8 +26043,15 @@ in { sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; }; + buildInputs = with self; [ nose jinja2 mock pytest ]; propagatedBuildInputs = with self; [ pyyaml ]; + doCheck = false; + + checkPhase = '' + py.test + ''; + meta = { description = "Media asset management for Python, with glue code for various web frameworks"; homepage = "http://github.com/miracle2k/webassets/"; From 7d2bc0c2d215bfb9ddd1652bc0e35ca7099833a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 21:04:31 +0100 Subject: [PATCH 206/219] pythonPackages.numtraits: needs six --- pkgs/top-level/python-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1777dbad636..3f730ebe77a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15899,16 +15899,21 @@ in { }; numtraits = buildPythonPackage rec { - name = "numtraits-${version}"; + pname = "numtraits"; version = "0.2"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/n/numtraits/${name}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy traitlets]; + propagatedBuildInputs = with self; [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; meta = { description = "Numerical traits for Python objects"; From 9c87884fdf38fd517d10a632908434aa426645eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Dec 2016 20:06:57 +0000 Subject: [PATCH 207/219] merlin: 2.5.2 -> 2.5.3 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 2aa2321ef6a..7af1b5ccd7a 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.2"; + "2.5.3"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; + "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha"; }; in From 36f980b7ff98f0106a534166f28b9eabb4ec7e20 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 2 Dec 2016 05:50:50 +0900 Subject: [PATCH 208/219] firefox-esr: security 45.5.0 -> 45.5.1 (#20841) --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3ab8ced9fc8..6000f260231 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -153,8 +153,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.5.0esr"; - sha512 = "fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d"; + version = "45.5.1esr"; + sha512 = "36c56e1486a6a35f71526bd81d01fb4fc2b9df852eb2feb39b77c902fcf90d713d8fcdcd6113978630345e1ed36fa5cf0df6da7b6bf7e85a84fe014cb11f9a03"; }; } From d4858edf57f1e3d89f136ea96436979a614aefdc Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 1 Dec 2016 22:29:44 +0100 Subject: [PATCH 209/219] ponyc: 0.6.0 -> 0.9.0 --- pkgs/development/compilers/ponyc/default.nix | 6 +++--- .../compilers/ponyc/disable-tests.patch | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 122b9ff7ed1..2bce01551ee 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.6.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q"; + sha256 = "1g2i3x9k36h5rx7ifx0i6hn78xlj42i86x8apwzvkh0y84y88adi"; }; buildInputs = [ llvm makeWrapper which ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = http://www.ponylang.org; license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.doublec ]; + maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ]; platforms = stdenv.lib.platforms.unix; }; }) diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch index 696dc005f0a..38740cf963e 100644 --- a/pkgs/development/compilers/ponyc/disable-tests.patch +++ b/pkgs/development/compilers/ponyc/disable-tests.patch @@ -1,15 +1,19 @@ -diff --git a/packages/net/_test.pony b/packages/net/_test.pony -index ce26bd7..9a98cc7 100644 ---- a/packages/net/_test.pony -+++ b/packages/net/_test.pony -@@ -5,9 +5,7 @@ actor Main is TestList +diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony +--- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100 ++++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100 +@@ -5,14 +5,7 @@ new make() => None - + fun tag tests(test: PonyTest) => - test(_TestBroadcast) - test(_TestTCPWritev) - test(_TestTCPExpect) +- test(_TestTCPMute) +- test(_TestTCPUnmute) +- ifdef not windows then +- test(_TestTCPThrottle) +- end + None - + class _TestPing is UDPNotify let _h: TestHelper From 5afc6b506cc6e96cd03008a6f014edfbf1cfa432 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 1 Dec 2016 20:34:02 -0500 Subject: [PATCH 210/219] linux: 4.1.35 -> 4.1.36 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 67d8d267b54..b7f98829931 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.35"; + version = "4.1.36"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl"; + sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1"; }; kernelPatches = args.kernelPatches; From 4e2e2039c2f111924a3c733babdc988771c62ccf Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 2 Dec 2016 03:25:01 +0100 Subject: [PATCH 211/219] pythonPackages.acoustic: fix meta.license There is no licenses.bsd; the upstream license looks like 3-clause BSD. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f730ebe77a..7ae28a275b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -60,7 +60,7 @@ in { meta = { description = "A package for acousticians"; maintainer = with maintainers; [ fridh ]; - license = with licenses; [ bsd ]; + license = with licenses; [ bsd3 ]; homepage = https://github.com/python-acoustics/python-acoustics; }; }; From 813e5284cf4621572aee6d53c1639573fdb7fc5e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 2 Dec 2016 13:14:22 +0900 Subject: [PATCH 212/219] urlwatch: 2.2 -> 2.5 --- pkgs/tools/networking/urlwatch/default.nix | 27 ++++++-------- pkgs/tools/networking/urlwatch/setup.patch | 42 ---------------------- 2 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 pkgs/tools/networking/urlwatch/setup.patch diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3634b852fad..c1b19f745a3 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-2.2"; + name = "urlwatch-${version}"; + version = "2.5"; - src = fetchurl { - url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0s9056mm1hkj5gpzsb5bz6fwxk0nm73i0dhnqwa1bfddjnvpl9d3"; + src = fetchFromGitHub { + owner = "thp"; + repo = "urlwatch"; + rev = version; + sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94"; }; - patches = [ - ./setup.patch - ]; - propagatedBuildInputs = with python3Packages; [ keyring minidb @@ -19,14 +18,10 @@ python3Packages.buildPythonApplication rec { requests2 ]; - postFixup = '' - wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" - ''; - - meta = { + meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; homepage = https://thp.io/2008/urlwatch/; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.tv ]; + license = licenses.bsd3; + maintainers = with maintainers; [ tv ]; }; } diff --git a/pkgs/tools/networking/urlwatch/setup.patch b/pkgs/tools/networking/urlwatch/setup.patch deleted file mode 100644 index 66626dbf025..00000000000 --- a/pkgs/tools/networking/urlwatch/setup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001 -From: Thomas Perl -Date: Tue, 28 Jun 2016 18:15:51 +0200 -Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73) - ---- - setup.py | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 947a7c8..45405cd 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,10 +7,15 @@ - - import os - import re -+import sys - - PACKAGE_NAME = 'urlwatch' - DEPENDENCIES = ['minidb', 'PyYAML', 'requests'] --HERE = os.path.dirname(__file__) -+HERE = os.path.abspath(os.path.dirname(__file__)) -+ -+if os.path.normpath(os.getcwd()) != os.path.normpath(HERE): -+ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd())) -+ sys.exit(1) - - # Assumptions: - # 1. Package name equals main script file name (and only one script) -@@ -29,9 +34,9 @@ - - m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)] - m['package_dir'] = {'': os.path.join(HERE, 'lib')} --m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:]) -+m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:]) - for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files] --m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files]) -+m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files]) - for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files] - m['install_requires'] = DEPENDENCIES - From fe514b3053acf72e91eea725ffd74de2502ec7ed Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Fri, 2 Dec 2016 02:52:11 -0500 Subject: [PATCH 213/219] spotify: 1.0.42.151 -> 1.0.43.125 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index c9139a8c227..0ff4e2c1cbc 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.42.151.g19de0aa6-74"; + version = "1.0.43.125.g376063c5-91"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "905c0c87091855c9d5d354ebeca9fb3951ff60c08f0dfc1c1898bf66cc8acd15"; + sha256 = "1qkyfqi6dy8sggq8kakl6y03l6w2fcxb22ya3kxb4d468bifss3v"; }; buildInputs = [ dpkg makeWrapper ]; From da3d8d077d3533a493fd2ae6554a7962a3d831b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Dec 2016 10:35:17 +0100 Subject: [PATCH 214/219] pythonPackages.django_guardian: add missing pytest --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ae28a275b3..e990295f1e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10085,7 +10085,7 @@ in { sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895"; }; - buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock ]; + buildInputs = with self ; [ pytest pytestrunner pytestdjango django_environ mock ]; propagatedBuildInputs = with self ; [ django six ]; checkPhase = '' From 538ec0cc929684058a0dda7587446afd2ab351dc Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Fri, 2 Dec 2016 03:31:01 -0700 Subject: [PATCH 215/219] teensyduino: init at 1.31 (#20807) --- .../arduino/arduino-core/default.nix | 110 +++++++++++++++++- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index ccf6dac895c..fbc139c314f 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,10 +1,21 @@ { stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant , libusb, libusb1, unzip, zlib, ncurses, readline -, withGui ? false, gtk2 ? null +, withGui ? false, gtk2 ? null, withTeensyduino ? false + /* Packages needed for Teensyduino */ +, upx, fontconfig, xorg, gcc, xdotool, xvfb_run +, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype }: assert withGui -> gtk2 != null; +assert withTeensyduino -> withGui; +# TODO: Teensyduino is disabled for i686-linux due to an indefinite hang in the +# xdotool script; the cause of this hang is not yet known. +# TODO: There is a fair chance that Teensyduino works with arm-linux, but it +# has not yet been tested. +if withTeensyduino && (stdenv.system != "x86_64-linux") then throw + "Teensyduino is only supported on x86_64-linux at this time (patches welcome)." +else let externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;}; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand @@ -14,10 +25,37 @@ let ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; + + teensy_libpath = stdenv.lib.makeLibraryPath [ + atk + expat + fontconfig + freetype + gcc.cc.lib + gdk_pixbuf + glib + gtk2 + libpng12 + libusb + pango + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXft + xorg.libXinerama + zlib + ]; + teensy_architecture = + lib.optionalString (stdenv.system == "x86_64-linux") "linux64" + + lib.optionalString (stdenv.system == "i686-linux") "linux32" + + lib.optionalString (stdenv.system == "arm-linux") "linuxarm"; + + flavor = (if withTeensyduino then "teensyduino" else "arduino") + + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.6.12"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; + name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; @@ -26,7 +64,19 @@ stdenv.mkDerivation rec { sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; }; - buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; + teensyduino_src = fetchurl { + url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}"; + sha256 = + lib.optionalString ("${teensy_architecture}" == "linux64") + "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9" + + lib.optionalString ("${teensy_architecture}" == "linux32") + "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc" + + lib.optionalString ("${teensy_architecture}" == "linuxarm") + "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn"; + }; + + buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline + ] ++ stdenv.lib.optionals withTeensyduino [ upx xvfb_run xdotool ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -75,6 +125,50 @@ stdenv.mkDerivation rec { --replace '' "$out/bin/arduino" \ --replace '' "$out/share/arduino/icons/128x128/apps/arduino.png" ''} + + ${stdenv.lib.optionalString withTeensyduino '' + # Extract and patch the Teensyduino installer + cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture} + chmod +w ./TeensyduinoInstall.${teensy_architecture} + upx -d ./TeensyduinoInstall.${teensy_architecture} + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${teensy_libpath}" \ + ./TeensyduinoInstall.${teensy_architecture} + chmod +x ./TeensyduinoInstall.${teensy_architecture} + + # Run the GUI-only installer in a virtual X server + # Script thanks to AUR package. See: + # + echo "Running Teensyduino installer..." + # Trick the GUI into using HOME as the install directory. + export HOME=$out/share/arduino + # Run the installer in a virtual X server in memory. + xvfb-run -n 99 ./TeensyduinoInstall.${teensy_architecture} & + sleep 4 + echo "Waiting for Teensyduino to install (about 1 minute)..." + # Control the installer GUI with xdotool. + DISPLAY=:99 xdotool search --class "teensyduino" \ + windowfocus \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key space sleep 35 \ + key space sleep 2 & + # Wait for xdotool to terminate and swallow the inevitable XIO error + wait $! || true + + # Check for successful installation + [ -d $out/share/arduino/hardware/teensy ] || exit 1 + ''} ''; # So we don't accidentally mess with firmware files @@ -101,6 +195,14 @@ stdenv.mkDerivation rec { # avrdude_bin is linked against libtinfo.so.5 mkdir $out/lib/ ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 + + ${stdenv.lib.optionalString withTeensyduino '' + # Patch the Teensy loader binary + patchelf --debug \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${teensy_libpath}" \ + $out/share/arduino/hardware/tools/teensy + ''} ''; meta = with stdenv.lib; { @@ -108,6 +210,6 @@ stdenv.mkDerivation rec { homepage = http://arduino.cc/; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ antono robberer bjornfor ]; + maintainers = with maintainers; [ antono auntie robberer bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84923c56642..01d8593a676 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,6 +6502,8 @@ in tcptrack = callPackage ../development/tools/misc/tcptrack { }; + teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; + teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; From 19fd547a7fee2665ba562933cc385a5fbe0f63a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 2 Dec 2016 13:03:24 +0100 Subject: [PATCH 216/219] Fixing the patch for icu for ARM. The source file changed paths. --- .../libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb3..72d3f67d3bc 100644 --- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj source/config/mh-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/mh-linux b/config/mh-linux +diff --git a/source/config/mh-linux b/source/config/mh-linux index 366f0cc..2689aab 100644 ---- a/config/mh-linux -+++ b/config/mh-linux +--- a/source/config/mh-linux ++++ b/source/config/mh-linux @@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, From 8c9582ca673f581dcb3e564f58c4c0a71d0b4e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 07:43:24 +0100 Subject: [PATCH 217/219] gajim: add enableOmemoPluginDependencies option --- .../networking/instant-messengers/gajim/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e03b99aa171..11e2b13653d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,6 +7,7 @@ , enableRST ? true , enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false +, enableOmemoPluginDependencies ? false , extraPythonPackages ? pkgs: [] }: @@ -68,7 +69,9 @@ stdenv.mkDerivation rec { ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils ++ optional enableNotifications pythonPackages.notify - ++ extraPythonPackages pythonPackages; + ++ optionals enableOmemoPluginDependencies (with pythonPackages; [ + cryptography python-axolotl python-axolotl-curve25519 qrcode + ]) ++ extraPythonPackages pythonPackages; postFixup = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \ From 654f5df5dcac1aa326cc9abeca236710d9001941 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Dec 2016 14:28:26 -0500 Subject: [PATCH 218/219] linux: 4.4.35 -> 4.4.36 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8e92afca6e4..6d9fc79cd9f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.35"; + version = "4.4.36"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1spqkh0bsd2s4qjlaa5q0cr2qdlw0bflxinr451dbhwrzdwfnaz9"; + sha256 = "1gh3i7ss0wnh3irpff3j079jwyccslbzkw9zxjjp600lcc5hva9h"; }; kernelPatches = args.kernelPatches; From 853b6493c87155388fd4a22f46c637a076e929a7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Dec 2016 14:29:00 -0500 Subject: [PATCH 219/219] linux: 4.8.11 -> 4.8.12 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 4937c2271c7..715af76267c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.11"; + version = "4.8.12"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; + sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; }; kernelPatches = args.kernelPatches;