From 4fe289860888668956b7e79e24efeb101c2f51d1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 17 May 2018 18:53:13 -0400 Subject: [PATCH 001/153] nixpkgs module: Fix defaulting of `localSystem` and `system` My c6f7d4367894047592cc412740f0c1f5b2ca2b59 made the mistake of not having enough defaults. Now both variables are default as the *explicit* value of the other, or a fallback. The fallback of `system` is the default of `localSystem.system`. The fallback of `localSystem` is not the other default (projected), as that would cause a cycle, but `{ system = builtins.currentTime; }` just as nixpkgs itself does it. --- nixos/modules/misc/nixpkgs.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8fbe218b232a..29019ed3d552 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -1,9 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let cfg = config.nixpkgs; + opts = options.nixpgs; isConfig = x: builtins.isAttrs x || lib.isFunction x; @@ -62,12 +63,11 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays localSystem crossSystem; + inherit (cfg) config overlays localSystem crossSystem; } ''; default = import ../../.. { - localSystem = { inherit (cfg) system; } // cfg.localSystem; - inherit (cfg) config overlays crossSystem; + inherit (cfg) config overlays localSystem crossSystem; }; type = pkgsType; example = literalExample ''import {}''; @@ -140,7 +140,7 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform - default = { system = builtins.currentSystem; }; + default = { system = cfg.system or builtins.currentSystem; }; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; defaultText = literalExample ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; @@ -179,6 +179,8 @@ in system = mkOption { type = types.str; + default = cfg.localSystem.system + or opts.localSystem.default.system; example = "i686-linux"; description = '' Specifies the Nix platform type on which NixOS should be built. @@ -196,6 +198,7 @@ in See nixpkgs.localSystem for more information. + Ignored when nixpkgs.localSystem is set. Ignored when nixpkgs.pkgs is set. ''; }; From 3e09239882d84a26b4d9d9597b54682412992263 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 26 May 2018 20:44:38 +0200 Subject: [PATCH 002/153] grub2: compile grub-mount as well It is a dependency of os-prober >= 1.75 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23 --- pkgs/tools/misc/grub/2.0x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 96ce38ea9e85..84c06a49f843 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, fuse # only needed for grub-mount , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -83,7 +84,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; - configureFlags = optional zfsSupport "--enable-libzfs" + configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"]; From b04f9b7d28956c39042367373085d52898197d42 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 26 May 2018 20:46:30 +0200 Subject: [PATCH 003/153] os-prober: switch to a non-transient url pool urls get removed after some time --- pkgs/tools/misc/os-prober/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index b879f621e142..b3f4d63c8c6e 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { version = "1.76"; name = "os-prober-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz"; - sha256 = "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"; + url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; + sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; }; buildInputs = [ makeWrapper ]; From f8d08ec818554293c22ca1cf1c500411a13c4560 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 26 May 2018 20:47:52 +0200 Subject: [PATCH 004/153] os-prober: fix dependencies busybox seems to have never been needed systemd was meant to provide udevadm; use libudev instead devicemapper is now uneeded, replaced by grub-mount and grub-info dmraid does not appear in the current code --- pkgs/tools/misc/os-prober/default.nix | 37 +++++++++------------------ 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index b3f4d63c8c6e..f10ecbe2a5ed 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, makeWrapper, -systemd, # udevadm -busybox, -coreutils, # os-prober desn't seem to work with pure busybox -devicemapper, # lvs -# optional dependencies -cryptsetup ? null, -libuuid ? null, # blkid and blockdev -dmraid ? null, -ntfs3g ? null +# optional dependencies, the command(s) they provide +coreutils, # mktemp +grub2, # grub-mount and grub-probe +cryptsetup, # cryptsetup +libuuid, # blkid and blockdev +libudev, # udevadm udevinfo +ntfs3g # ntfs3g }: stdenv.mkDerivation rec { @@ -21,12 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' # executables - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/share - cp os-prober linux-boot-prober $out/bin - cp newns $out/lib - cp common.sh $out/share + install -Dt $out/bin os-prober linux-boot-prober + install -Dt $out/lib newns + install -Dt $out/share common.sh # probes case "${stdenv.system}" in @@ -36,8 +31,7 @@ stdenv.mkDerivation rec { *) ARCH=other;; esac; for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do - mkdir -p $out/lib/$probes; - cp $probes/common/* $out/lib/$probes; + install -Dt $out/lib/$probes $probes/common/*; if [ -e "$probes/$ARCH" ]; then mkdir -p $out/lib/$probes cp -r $probes/$ARCH/* $out/lib/$probes; @@ -57,14 +51,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --set LVM_SYSTEM_DIR ${devicemapper} \ - --suffix PATH : "$out/bin${builtins.foldl' (x: y: x + ":" + y) "" ( - map (x: (toString x) + "/bin") ( - builtins.filter (x: x!=null) - [ devicemapper systemd coreutils cryptsetup libuuid dmraid ntfs3g busybox ] - ) - ) - }" \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; From b8ea160bf374a8208278aaf627d539ff1de1ce76 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 26 May 2018 20:49:47 +0200 Subject: [PATCH 005/153] os-prober: add symphorien as maintainer --- pkgs/tools/misc/os-prober/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index f10ecbe2a5ed..c4a304e0d284 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -56,9 +56,10 @@ stdenv.mkDerivation rec { done; ''; - meta = { + meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; homepage = http://packages.debian.org/source/sid/os-prober; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ symphorien ]; }; } From 3d9cd5d0c58ee35e1ef327f06b2f114e045569b6 Mon Sep 17 00:00:00 2001 From: Grigory Chereshnev <35115302+nonfreeblob@users.noreply.github.com> Date: Sun, 27 May 2018 22:23:39 +0300 Subject: [PATCH 006/153] ivan: init at 052 --- maintainers/maintainer-list.nix | 5 +++ pkgs/games/ivan/default.nix | 44 +++++++++++++++++++ pkgs/games/ivan/homedir.patch | 75 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 126 insertions(+) create mode 100644 pkgs/games/ivan/default.nix create mode 100644 pkgs/games/ivan/homedir.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 92a4a6e8b412..4c312316da4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2770,6 +2770,11 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; + nonfreeblob = { + email = "nonfreeblob@yandex.com"; + github = "nonfreeblob"; + name ="nonfreeblob"; + }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix new file mode 100644 index 000000000000..50b9f03d4bc9 --- /dev/null +++ b/pkgs/games/ivan/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchFromGitHub, libpng, cmake, SDL2, SDL2_mixer, pkgconfig, pcre}: + +stdenv.mkDerivation rec { + + name = "ivan-${version}"; + version = "052"; + + src = fetchFromGitHub { + owner = "Attnam"; + repo = "ivan"; + rev = "v${version}"; + sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b"; + }; + + buildInputs = [SDL2 SDL2_mixer libpng pcre]; + + nativeBuildInputs = [cmake pkgconfig]; + + hardeningDisable = ["all"]; + + # To store bone and high score files in ~/.ivan of the current user + patches = [./homedir.patch]; + + # Enable wizard mode + cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"]; + + # Help CMake find SDL_mixer.h + NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2"; + + meta = with stdenv.lib; { + description = "Graphical roguelike game"; + longDescription = '' + Iter Vehemens ad Necem (IVAN) is a graphical roguelike game, which currently + runs in Windows, DOS, Linux, and OS X. It features advanced bodypart and + material handling, multi-colored lighting and, above all, deep gameplay. + + This is a fan continuation of IVAN by members of Attnam.com + ''; + homepage = https://attnam.com/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [nonfreeblob]; + }; +} diff --git a/pkgs/games/ivan/homedir.patch b/pkgs/games/ivan/homedir.patch new file mode 100644 index 000000000000..312099f7ffd9 --- /dev/null +++ b/pkgs/games/ivan/homedir.patch @@ -0,0 +1,75 @@ +diff --git a/FeLib/Include/hscore.h b/FeLib/Include/hscore.h +index 4caf3ff..1a02845 100644 +--- a/FeLib/Include/hscore.h ++++ b/FeLib/Include/hscore.h +@@ -31,11 +31,11 @@ class festring; + class highscore + { + public: +- highscore(cfestring& = HIGH_SCORE_FILENAME); ++ highscore(); + truth Add(long, cfestring&); + void Draw() const; +- void Save(cfestring& = HIGH_SCORE_FILENAME) const; +- void Load(cfestring& = HIGH_SCORE_FILENAME); ++ void Save() const; ++ void Load(); + truth LastAddFailed() const; + void AddToFile(highscore*) const; + truth MergeToFile(highscore*) const; +diff --git a/FeLib/Source/hscore.cpp b/FeLib/Source/hscore.cpp +index 2e5318d..ff9c174 100644 +--- a/FeLib/Source/hscore.cpp ++++ b/FeLib/Source/hscore.cpp +@@ -23,7 +23,7 @@ cfestring& highscore::GetEntry(int I) const { return Entry[I]; } + long highscore::GetScore(int I) const { return Score[I]; } + long highscore::GetSize() const { return Entry.size(); } + +-highscore::highscore(cfestring& File) : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(File); } ++highscore::highscore() : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(); } + + truth highscore::Add(long NewScore, cfestring& NewEntry, + time_t NewTime, long NewRandomID) +@@ -98,8 +98,12 @@ void highscore::Draw() const + List.Draw(); + } + +-void highscore::Save(cfestring& File) const ++void highscore::Save() const + { ++ std::string buffer(getenv("HOME")); ++ buffer.append("/.ivan/ivan-highscore.scores"); ++ cfestring& File = buffer.c_str(); ++ + outputfile HighScore(File); + long CheckSum = HIGH_SCORE_VERSION + LastAdd; + for(ushort c = 0; c < Score.size(); ++c) +@@ -112,8 +116,12 @@ void highscore::Save(cfestring& File) const + } + + /* This function needs much more error handling */ +-void highscore::Load(cfestring& File) ++void highscore::Load() + { ++ std::string buffer(getenv("HOME")); ++ buffer.append("/.ivan/ivan-highscore.scores"); ++ cfestring& File = buffer.c_str(); ++ + { + inputfile HighScore(File, 0, false); + +diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp +index 8927305..c18e790 100644 +--- a/Main/Source/game.cpp ++++ b/Main/Source/game.cpp +@@ -2380,7 +2380,9 @@ festring game::GetDataDir() + festring game::GetBoneDir() + { + #ifdef UNIX +- return LOCAL_STATE_DIR "/Bones/"; ++ festring BoneDir; ++ BoneDir << getenv("HOME") << "/.ivan/Bones/"; ++ return BoneDir; + #endif + + #if defined(WIN32) || defined(__DJGPP__) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34fd1a7672be..e8e090a87499 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3159,6 +3159,8 @@ with pkgs; isync = callPackage ../tools/networking/isync { }; isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { }; + ivan = callPackage ../games/ivan { }; + jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { From 0f51d1fa59c7844990765f6ce36ac7f3df5163a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 05:14:44 +0000 Subject: [PATCH 007/153] ocamlPackages.gapi-ocaml: clean installPhase --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index a7c32a069fc8..9c7be26503f5 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "gapi-ocaml is not available for OCaml ${ocaml.version}" @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml jbuilder findlib ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; - installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { description = "OCaml client for google services"; From b0102f550153a98bd44e6efea1bdb030c1cf6507 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 05:25:14 +0000 Subject: [PATCH 008/153] ocamlPackages_4_02.async_ssl: remove redundancy --- pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index fdfd0338bb23..bc1977ce2d69 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -6,7 +6,6 @@ buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; - postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { From 28c20a4731da9d5ba539e2d1ef6bcf3ddf1026ac Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Tue, 29 May 2018 19:53:12 +0200 Subject: [PATCH 009/153] nixos/gitea: fix pre start script The hooks directory contains now one level deep subdirectories which need to be updated as well. If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be updated because of the hardcoded path to gitea in the "command" option. --- nixos/modules/services/misc/gitea.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 2d0f66de037d..45dfdc71eb36 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -282,7 +282,7 @@ in mkdir -p ${cfg.repositoryRoot} # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") + HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 5 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS @@ -295,6 +295,11 @@ in mkdir -p ${cfg.stateDir}/conf cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale fi + # update command option in authorized_keys + if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] + then + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys + fi '' + optionalString (usePostgresql && cfg.database.createDatabase) '' if ! test -e "${cfg.stateDir}/db-created"; then echo "CREATE ROLE ${cfg.database.user} From f43446c9ca382e8d50901b409080171a2087f630 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 May 2018 14:07:41 +0200 Subject: [PATCH 010/153] vim_configurable: restore ability to override python for modules It seems as Python will be fetched from $PATH in Vim 8.1: ``` stat("/home/ma27/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory) stat("/run/wrappers/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory) stat("/home/ma27/.nix-profile/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory) stat("/nix/var/nix/profiles/default/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory) stat("/run/current-system/sw/bin/python", {st_mode=S_IFREG|0555, st_size=291, ...}) = 0 readlink("/run/current-system/sw/bin/python", "/nix/store/ggjkqbvwnv7dflkmdgmmp"..., 4096) = 72 ``` This breaks in cases where you want to use a modified Python derivation for the VIM plugins you use in `vim_configurable`: ``` let vim_configurable' = vim_configurable.override { # python with modules for ensime python = python.withPackages (ps: with ps; [ sexpdata websocket_client ]); }; in vim_configurable'.customize { # ... } ``` With VIM 8.0 this worked perfectly fine, now it's necessary to install the modified `python` in $PATH to actually use it, otherwise an error like this arises: ``` [ensime] A dependency is missing, please `pip2 install sexpdata websocket-client` and restart Vim. Press ENTER or type command to continue ``` However it should be possible to pass the modified Python to the modules, the easiest workaround is to write a wrapper which prefixes $PATH to have the Python derivation available. --- pkgs/applications/editors/vim/configurable.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9ffa31f2f2e0..ad04cab62f51 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -5,10 +5,13 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins +, makeWrapper # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private +, wrapPythonDrv ? false + , ... }: with args; @@ -106,6 +109,11 @@ composableDerivation { feat = "python${if python ? isPy3 then "3" else ""}interp"; enable = { buildInputs = [ python ]; + } // lib.optionalAttrs wrapPythonDrv { + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + ''; } // lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes" From b4b65b2e67202d32a19bad9f83674d6e937ed8a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 30 May 2018 07:44:47 -0500 Subject: [PATCH 011/153] hub: 2.2.9 -> 2.3.0 Hooray! --- .../git-and-tools/hub/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 5c70b2cb2053..46d33d1944ca 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchgit, go, Security }: +{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: stdenv.mkDerivation rec { name = "hub-${version}"; - version = "2.2.9"; + version = "2.3.0"; src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "195ckp1idz2azv0mm1q258yjz2n51sia9xdcjnqlprmq9aig5ldh"; + sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s"; }; - buildInputs = [ go ] ++ stdenv.lib.optional stdenv.isDarwin Security; - - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + buildInputs = [ go ronn groff utillinux ] + ++ stdenv.lib.optional stdenv.isDarwin Security; buildPhase = '' + mkdir bin + ln -s ${ronn}/bin/ronn bin/ronn + patchShebangs . - sh script/build + make all man-pages ''; installPhase = '' - mkdir -p "$out/bin" - cp bin/hub "$out/bin/" - - mkdir -p "$out/share/man/man1" - cp "man/hub.1" "$out/share/man/man1/" + prefix=$out sh -x < script/install.sh mkdir -p "$out/share/zsh/site-functions" cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" @@ -33,8 +31,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/etc/bash_completion.d" cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" -# Should we also install provided git-hooks? -# ? + # Should we also install provided git-hooks? + # And fish completion? ''; meta = with stdenv.lib; { From 3088bdd04e118b5bc7927224df4ffd2e17082a8b Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Wed, 30 May 2018 10:38:58 -0400 Subject: [PATCH 012/153] librarian-puppet-go: update license Issue closed and upstream notes it's under MIT. --- pkgs/development/tools/librarian-puppet-go/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix index 1e2a421a6702..8adea820ec76 100644 --- a/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "librarian-puppet implementation in go."; - license = licenses.unfree; # still unspecified https://github.com/tmtk75/librarian-puppet-go/issues/5 + license = licenses.mit; maintainers = with maintainers; [ womfoo ]; platforms = [ "x86_64-linux" ]; }; From eee16f8ecc977f1848b77964720790b50f3fca55 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 30 May 2018 16:11:41 +0000 Subject: [PATCH 013/153] flann: fix build with cmake 3.11 after #40800 --- pkgs/development/libraries/flann/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 3cc518fee501..a25f3ea04e27 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, python }: +{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: stdenv.mkDerivation { name = "flann-1.9.1"; @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; + patches = [ + # Upstream issue: https://github.com/mariusmuja/flann/issues/369 + (fetchpatch { + url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch"; + sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4"; + }) + ]; + buildInputs = [ unzip cmake python ]; meta = { From 097937330a00163ed42059c5fdbf4dfe6c237de6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 30 May 2018 12:58:51 -0400 Subject: [PATCH 014/153] fetchFromGitlab: domain can be specified --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889d2040dc09..ba182ec54b0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -286,13 +286,13 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, name ? "source", + owner, repo, rev, domain ? "gitlab.com", name ? "source", ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; - meta.homepage = "https://gitlab.com/${owner}/${repo}/"; - } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; + url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + meta.homepage = "https://${domain}/${owner}/${repo}/"; + } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { From 39e9de1b85f1bec437333ed684cb0dc8cfe715c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 May 2018 19:07:02 +0200 Subject: [PATCH 015/153] Docs: improve Python section Explain `toPythonApplication` and `toPythonModule` as well as some minor improvements. --- doc/languages-frameworks/python.section.md | 68 ++++++++++++++++------ 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 23ceb82eb31e..7a48bbaeeeec 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -587,30 +587,32 @@ The `buildPythonPackage` mainly does four things: As in Perl, dependencies on other Python packages can be specified in the `buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime +exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime dependency, use `propagatedBuildInputs`. By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `buildInputs`. +e.g. the test runner, should be added to `checkInputs`. By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. ##### `buildPythonPackage` parameters -All parameters from `mkDerivation` function are still supported. +All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: -* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool. -* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples. -* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command. -* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). +* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. +* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. +* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. +* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. +* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. +* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. +* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. +* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. -* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. -* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. -* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. -* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. +* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. +* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. ##### Overriding Python packages @@ -646,7 +648,37 @@ The `buildPythonApplication` function is practically the same as `buildPythonPac The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. Because with an application we're not interested in multiple version the prefix is dropped. -#### python.buildEnv function +#### `toPythonApplication` function + +A distinction is made between applications and libraries, however, sometimes a +package is used as both. In this case the package is added as a library to +`python-packages.nix` and as an application to `all-packages.nix`. To reduce +duplication the `toPythonApplication` can be used to convert a library to an +application. + +The Nix expression shall use `buildPythonPackage` and be called from +`python-packages.nix`. A reference shall be created from `all-packages.nix` to +the attribute in `python-packages.nix`, and the `toPythonApplication` shall be +applied to the reference: +```nix +youtube-dl = with pythonPackages; toPythonApplication youtube-dl; +``` + +#### `toPythonModule` function + +In some cases, such as bindings, a package is created using +`stdenv.mkDerivation` and added as attribute in `all-packages.nix`. +The Python bindings should be made available from `python-packages.nix`. +The `toPythonModule` function takes a derivation and makes certain Python-specific modifications. +```nix +opencv = toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; +}); +``` +Do pay attention to passing in the right Python version! + +#### `python.buildEnv` function Python environments can be created using the low-level `pkgs.buildEnv` function. This example shows how to create an environment that has the Pyramid Web Framework. @@ -688,7 +720,7 @@ specified packages in its path. * `postBuild`: Shell command executed after the build of environment. * `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). -#### python.withPackages function +#### `python.withPackages` function The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. It takes a function as an argument that is passed the set of python packages and returns the list @@ -722,7 +754,7 @@ with import {}; In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. -Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` +Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` should be used with `ignoreCollisions = true`. ### Development mode @@ -790,8 +822,8 @@ example of such a situation is when `py.test` is used. - Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`. Most python modules follows the standard test protocol where the pytest runner can be used instead. - `py.test` supports a `-k` parameter to ignore test methods or classes: - + `py.test` supports a `-k` parameter to ignore test methods or classes: + ```nix buildPythonPackage { # ... @@ -988,7 +1020,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul }; ``` -If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). +If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). ### How to override a Python package using overlays? From a4867b30d1863e2ca45a66a2d5d4640c5e9b05d3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 30 May 2018 19:24:57 +0200 Subject: [PATCH 016/153] lispPackages.quicklisp: 2018-01-31 -> 2018-04-30; regenerate packages --- .../lisp-modules/lisp-packages.nix | 4 +- .../quicklisp-to-nix-output/anaphora.nix | 14 +- .../quicklisp-to-nix-output/caveman.nix | 53 +- .../quicklisp-to-nix-output/cffi-grovel.nix | 4 +- .../cffi-toolchain.nix | 4 +- .../quicklisp-to-nix-output/cffi.nix | 4 +- .../quicklisp-to-nix-output/chipz.nix | 14 +- .../circular-streams.nix | 7 +- .../quicklisp-to-nix-output/cl-aa.nix | 14 +- .../quicklisp-to-nix-output/cl-async-repl.nix | 9 +- .../quicklisp-to-nix-output/cl-async-ssl.nix | 9 +- .../quicklisp-to-nix-output/cl-async.nix | 8 +- .../quicklisp-to-nix-output/cl-colors.nix | 14 +- .../quicklisp-to-nix-output/cl-csv.nix | 18 +- .../quicklisp-to-nix-output/cl-dbi.nix | 14 +- .../quicklisp-to-nix-output/cl-emb.nix | 14 +- .../quicklisp-to-nix-output/cl-fad.nix | 14 +- .../cl-fuse-meta-fs.nix | 7 +- .../quicklisp-to-nix-output/cl-fuse.nix | 7 +- .../quicklisp-to-nix-output/cl-libuv.nix | 20 +- .../quicklisp-to-nix-output/cl-paths-ttf.nix | 14 +- .../quicklisp-to-nix-output/cl-paths.nix | 14 +- .../quicklisp-to-nix-output/cl-postgres.nix | 14 +- .../quicklisp-to-nix-output/cl-protobufs.nix | 14 +- .../quicklisp-to-nix-output/cl-store.nix | 14 +- .../quicklisp-to-nix-output/cl-unicode.nix | 14 +- .../quicklisp-to-nix-output/cl-vectors.nix | 14 +- .../quicklisp-to-nix-output/cl_plus_ssl.nix | 14 +- .../quicklisp-to-nix-output/clack-socket.nix | 14 +- .../quicklisp-to-nix-output/clack-test.nix | 63 +- .../clack-v1-compat.nix | 61 +- .../quicklisp-to-nix-output/clack.nix | 25 +- .../quicklisp-to-nix-output/closer-mop.nix | 14 +- .../quicklisp-to-nix-output/clx-truetype.nix | 7 +- .../quicklisp-to-nix-output/clx.nix | 14 +- .../css-selectors-simple-tree.nix | 53 ++ .../css-selectors-stp.nix | 52 ++ .../quicklisp-to-nix-output/dbd-mysql.nix | 14 +- .../quicklisp-to-nix-output/dbd-postgres.nix | 14 +- .../quicklisp-to-nix-output/dbd-sqlite3.nix | 14 +- .../quicklisp-to-nix-output/dbi.nix | 14 +- .../quicklisp-to-nix-output/dexador.nix | 31 +- .../documentation-utils.nix | 14 +- .../quicklisp-to-nix-output/esrap.nix | 14 +- .../quicklisp-to-nix-output/fast-io.nix | 7 +- .../quicklisp-to-nix-output/fiasco.nix | 14 +- .../quicklisp-to-nix-output/fiveam.nix | 14 +- .../quicklisp-to-nix-output/flexi-streams.nix | 14 +- .../quicklisp-to-nix-output/http-body.nix | 21 +- .../hu_dot_dwim_dot_asdf.nix | 14 +- .../quicklisp-to-nix-output/iolib.nix | 10 +- .../iolib_dot_asdf.nix | 4 +- .../iolib_dot_base.nix | 4 +- .../iolib_dot_common-lisp.nix | 4 +- .../iolib_dot_conf.nix | 4 +- .../iolib_dot_grovel.nix | 18 +- .../quicklisp-to-nix-output/ironclad.nix | 19 +- .../quicklisp-to-nix-output/iterate.nix | 14 +- .../quicklisp-to-nix-output/ixf.nix | 26 +- .../quicklisp-to-nix-output/jonathan.nix | 35 +- .../lack-component.nix | 14 +- .../lack-middleware-backtrace.nix | 14 +- .../quicklisp-to-nix-output/lack-util.nix | 14 +- .../quicklisp-to-nix-output/lack.nix | 14 +- .../quicklisp-to-nix-output/local-time.nix | 14 +- .../quicklisp-to-nix-output/marshal.nix | 14 +- .../quicklisp-to-nix-output/md5.nix | 14 +- .../quicklisp-to-nix-output/mssql.nix | 25 +- .../quicklisp-to-nix-output/nibbles.nix | 18 +- .../quicklisp-to-nix-output/parse-number.nix | 18 +- .../quicklisp-to-nix-output/plump.nix | 14 +- .../quicklisp-to-nix-output/postmodern.nix | 21 +- .../quicklisp-to-nix-output/puri.nix | 14 +- .../quicklisp-to-nix-output/query-fs.nix | 9 +- .../quicklisp-to-nix-output/s-sql.nix | 30 +- .../quicklisp-to-nix-output/simple-date.nix | 14 +- .../split-sequence.nix | 16 +- .../static-vectors.nix | 6 +- .../quicklisp-to-nix-output/stumpwm.nix | 14 +- .../trivial-gray-streams.nix | 14 +- .../quicklisp-to-nix-output/uffi.nix | 14 +- .../quicklisp-to-nix-output/woo.nix | 11 +- .../quicklisp-to-nix-output/wookie.nix | 47 +- .../quicklisp-to-nix-output/xmls.nix | 21 +- .../lisp-modules/quicklisp-to-nix-systems.txt | 2 + .../lisp-modules/quicklisp-to-nix.nix | 540 +++++++++++++----- 86 files changed, 1231 insertions(+), 719 deletions(-) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index c63a9b3a054d..f208b47234c6 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt"; - sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy"; + url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt"; + sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq"; }; buildPhase = '' true; ''; postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index f1fdf5bb8dca..61a07c61ca07 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''anaphora''; - version = ''20170227-git''; + version = ''20180228-git''; parasites = [ "anaphora/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz''; - sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9''; + url = ''http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz''; + sha256 = ''1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41''; }; packageName = "anaphora"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 - 1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL - http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz - MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora FILENAME anaphora DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20170227-git SIBLINGS NIL + 1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41 URL + http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz + MD5 a884be2d820c0bc7dc59dea7ffd72731 NAME anaphora FILENAME anaphora DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180228-git SIBLINGS NIL PARASITES (anaphora/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index e60f60a303bf..02e6e2bf6045 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -5,7 +5,7 @@ rec { description = ''Web Application Framework for Common Lisp''; - deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz''; @@ -24,35 +24,56 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME circular-streams FILENAME circular-streams) - (NAME cl-annot FILENAME cl-annot) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot) (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-emb FILENAME cl-emb) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-project FILENAME cl-project) + (NAME cl-reexport FILENAME cl-reexport) + (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME cl-utilities FILENAME cl-utilities) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) + (NAME clack-test FILENAME clack-test) (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode) - (NAME http-body FILENAME http-body) (NAME lack FILENAME lack) - (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) - (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal) - (NAME myway FILENAME myway) + (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) + (NAME flexi-streams FILENAME flexi-streams) + (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) + (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) + (NAME lack-component FILENAME lack-component) + (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) + (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) + (NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set) + (NAME marshal FILENAME marshal) (NAME myway FILENAME myway) (NAME named-readtables FILENAME named-readtables) + (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-mimes FILENAME trivial-mimes) (NAME trivial-types FILENAME trivial-types) - (NAME usocket FILENAME usocket)) + (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria anaphora babel babel-streams bordeaux-threads circular-streams - cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project - cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador - do-urlencode http-body lack let-plus local-time map-set marshal myway - named-readtables prove quri split-sequence trivial-backtrace - trivial-features trivial-gray-streams trivial-types usocket) + (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel + cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text + cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project + cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test + clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams + http-body ironclad jonathan lack lack-component lack-middleware-backtrace + lack-util let-plus local-time map-set marshal myway named-readtables + nibbles proc-parse prove quri smart-buffer split-sequence static-vectors + trivial-backtrace trivial-features trivial-garbage trivial-gray-streams + trivial-mimes trivial-types usocket xsubseq) VERSION 20171019-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index 7923c444f24d..07b062b51978 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 + http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index 8234b83edfbb..f1d7e117655b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 + http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index d79a36e03028..8568d9a3dfab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -10,7 +10,7 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; }; @@ -21,7 +21,7 @@ rec { } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 + http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index e13932346a62..a9808173b626 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chipz''; - version = ''20160318-git''; + version = ''20180328-git''; description = ''A library for decompressing deflate, zlib, and gzip data''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz''; - sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826''; + url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz''; + sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7''; }; packageName = "chipz"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 - 1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL - http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz - MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz FILENAME chipz DEPS NIL - DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */ + 0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL + http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz + MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL + DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 8d2254e4bdcb..2e387d29833f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -5,7 +5,7 @@ rec { description = ''Circularly readable streams for Common Lisp''; - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; @@ -25,11 +25,12 @@ rec { circular-streams DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME fast-io FILENAME fast-io) (NAME static-vectors FILENAME static-vectors) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features - trivial-gray-streams) + (alexandria babel cffi cffi-grovel cffi-toolchain fast-io static-vectors + trivial-features trivial-gray-streams) VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 9a664aa97735..531d429df244 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-aa''; - version = ''cl-vectors-20170630-git''; + version = ''cl-vectors-20180228-git''; description = ''cl-aa: polygon rasterizer''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; - sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; + sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; }; packageName = "cl-aa"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 - 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL - http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz - MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa FILENAME cl-aa DEPS NIL - DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS + 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL + http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz + MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-aa FILENAME cl-aa DEPS NIL + DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 9291be14e33a..d72a9c69ac0f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -5,7 +5,7 @@ rec { description = ''REPL integration for CL-ASYNC.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; @@ -25,6 +25,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-async FILENAME cl-async) (NAME cl-async-base FILENAME cl-async-base) (NAME cl-async-util FILENAME cl-async-util) @@ -35,8 +36,8 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME vom FILENAME vom)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base - cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features - trivial-gray-streams vom) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async + cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors + trivial-features trivial-gray-streams vom) VERSION cl-async-20171130-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 4417d25be9f7..f7392b880d11 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -5,7 +5,7 @@ rec { description = ''SSL Wrapper around cl-async socket implementation.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; @@ -26,6 +26,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-async FILENAME cl-async) (NAME cl-async-base FILENAME cl-async-base) (NAME cl-async-util FILENAME cl-async-util) @@ -36,8 +37,8 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME vom FILENAME vom)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base - cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features - trivial-gray-streams vom) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async + cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors + trivial-features trivial-gray-streams vom) VERSION cl-async-20171130-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 6f62c9ff6b90..90638ed56f16 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -7,7 +7,7 @@ rec { description = ''Asynchronous operations for Common Lisp.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz''; @@ -26,6 +26,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) (NAME fast-io FILENAME fast-io) (NAME static-vectors FILENAME static-vectors) @@ -33,7 +34,8 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME uiop FILENAME uiop) (NAME vom FILENAME vom)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre - fast-io static-vectors trivial-features trivial-gray-streams uiop vom) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv + cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop + vom) VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 6a6ad9a6e700..0d0337a65cec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-colors''; - version = ''20151218-git''; + version = ''20180328-git''; parasites = [ "cl-colors-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz''; - sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4''; + url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz''; + sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a''; }; packageName = "cl-colors"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 - 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL - http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz - MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors FILENAME cl-colors DEPS + 0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a URL + http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz + MD5 5e59ea59b32a0254df9610a5662ae2ec NAME cl-colors FILENAME cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20151218-git + DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20180328-git SIBLINGS NIL PARASITES (cl-colors-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 82571660280a..b0fe8888dcfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20180131-git''; + version = ''20180228-git''; - parasites = [ "cl-csv/test" ]; + parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz''; - sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz''; + sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r''; }; packageName = "cl-csv"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 - 0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL - http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz - MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS + 1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL + http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz + MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2) - VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv/test)) */ + VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + (cl-csv/speed-test cl-csv/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index d485d276bab7..995ef9bc745e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20180131-git''; + version = ''20180430-git''; description = ''''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; - sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; + sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL - http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz - MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS + 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL + http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz + MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-types) - VERSION 20180131-git SIBLINGS + VERSION 20180430-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index a4da254cc6b7..78f70be2f1fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-emb''; - version = ''20170227-git''; + version = ''20180228-git''; description = ''A templating system for Common Lisp''; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz''; - sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80''; + url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz''; + sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw''; }; packageName = "cl-emb"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 - 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL - http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz - MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb FILENAME cl-emb DEPS + 0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL + http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz + MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION - 20170227-git SIBLINGS NIL PARASITES NIL) */ + 20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 0bc8488b2a8c..d032b4768dd6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fad''; - version = ''20171227-git''; + version = ''20180430-git''; parasites = [ "cl-fad-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz''; - sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8''; + url = ''http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz''; + sha256 = ''175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs''; }; packageName = "cl-fad"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 - 0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL - http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz - MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS + 175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs URL + http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz + MD5 005c1b7b376fc60dea72574d2acdc704 NAME cl-fad FILENAME cl-fad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION - 20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */ + 20180430-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index a972751f36a6..c33efa2eb08a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -5,7 +5,7 @@ rec { description = ''CFFI bindings to FUSE (Filesystem in user space)''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz''; @@ -26,6 +26,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall) (NAME pcall-queue FILENAME pcall-queue) @@ -33,7 +34,7 @@ rec { (NAME trivial-features FILENAME trivial-features) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-utilities - iterate pcall pcall-queue trivial-backtrace trivial-features + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse + cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index e597b192b308..d41fe76ca232 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -5,7 +5,7 @@ rec { description = ''CFFI bindings to FUSE (Filesystem in user space)''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; @@ -24,11 +24,12 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME trivial-features FILENAME trivial-features) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities iterate - trivial-backtrace trivial-features trivial-utf-8) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain + cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8) VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index deda83b7e0f6..1aced09d34fd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-libuv''; - version = ''20160825-git''; + version = ''20180328-git''; description = ''Low-level libuv bindings for Common Lisp.''; - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."trivial-features" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz''; - sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r''; + url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz''; + sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p''; }; packageName = "cl-libuv"; @@ -18,11 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL - http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz - MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv FILENAME cl-libuv DEPS + SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL + http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz + MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi cffi-grovel trivial-features) VERSION - 20160825-git SIBLINGS NIL PARASITES NIL) */ + DEPENDENCIES + (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION + 20180328-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index b0514e306d30..cfca59e3b503 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20170630-git''; + version = ''cl-vectors-20180228-git''; description = ''cl-paths-ttf: vectorial paths manipulation''; deps = [ args."cl-paths" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; - sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; + sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; }; packageName = "cl-paths-ttf"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation - SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL - http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz - MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf FILENAME + SHA256 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL + http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz + MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths-ttf FILENAME cl-paths-ttf DEPS ((NAME cl-paths FILENAME cl-paths) (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS + DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20180228-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index 770c25d924de..e8034b11c237 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-paths''; - version = ''cl-vectors-20170630-git''; + version = ''cl-vectors-20180228-git''; description = ''cl-paths: vectorial paths manipulation''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; - sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; + sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; }; packageName = "cl-paths"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-paths DESCRIPTION cl-paths: vectorial paths manipulation SHA256 - 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL - http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz - MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths FILENAME cl-paths DEPS - NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS + 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL + http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz + MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths FILENAME cl-paths DEPS + NIL DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-vectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 721dbf61aa92..60e38a7de720 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20180131-git''; + version = ''postmodern-20180430-git''; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; - sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; + sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; }; packageName = "cl-postgres"; @@ -20,14 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL - http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz - MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres + SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL + http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz + MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) - VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date) + VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date) PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 7ec440076c35..046f910a8660 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-protobufs''; - version = ''20170403-git''; + version = ''20180328-git''; description = ''Protobufs for Common Lisp''; deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz''; - sha256 = ''0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5''; + url = ''http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz''; + sha256 = ''0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj''; }; packageName = "cl-protobufs"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-protobufs DESCRIPTION Protobufs for Common Lisp SHA256 - 0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5 URL - http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz - MD5 86c8da92b246b4b77d6107bc5dfaff08 NAME cl-protobufs FILENAME + 0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj URL + http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz + MD5 6573322beb8f27653f0c9b418c5f5b92 NAME cl-protobufs FILENAME cl-protobufs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closer-mop FILENAME closer-mop) (NAME trivial-features FILENAME trivial-features) (NAME trivial-garbage FILENAME trivial-garbage)) DEPENDENCIES (alexandria babel closer-mop trivial-features trivial-garbage) - VERSION 20170403-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ + VERSION 20180328-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index 142fbfee2eab..2aff988dfd24 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-store''; - version = ''20160531-git''; + version = ''20180328-git''; parasites = [ "cl-store-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz''; - sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz''; + url = ''http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz''; + sha256 = ''1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n''; }; packageName = "cl-store"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 - 0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL - http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz - MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store FILENAME cl-store DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20160531-git SIBLINGS NIL + 1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n URL + http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz + MD5 2f8831cb60c0b0575c65e1dbebc07dee NAME cl-store FILENAME cl-store DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180328-git SIBLINGS NIL PARASITES (cl-store-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 25dfbbcae5f7..cec8cc2865c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unicode''; - version = ''20180131-git''; + version = ''20180328-git''; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz''; - sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa''; + url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz''; + sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln''; }; packageName = "cl-unicode"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL - http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz - MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode + 1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL + http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz + MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL + DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index b0e89eb23038..f44bd0f22e0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-vectors''; - version = ''20170630-git''; + version = ''20180228-git''; description = ''cl-paths: vectorial paths manipulation''; deps = [ args."cl-aa" args."cl-paths" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz''; - sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; + sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; }; packageName = "cl-vectors"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 - 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL - http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz - MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors FILENAME cl-vectors + 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL + http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz + MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-vectors FILENAME cl-vectors DEPS ((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths)) - DEPENDENCIES (cl-aa cl-paths) VERSION 20170630-git SIBLINGS + DEPENDENCIES (cl-aa cl-paths) VERSION 20180228-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 99aa768c8dfc..a757b3d4a8a0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20171227-git''; + version = ''cl+ssl-20180328-git''; parasites = [ "openssl-1.1.0" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz''; - sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz''; + sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL - http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz - MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL + http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz + MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES (openssl-1.1.0)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 7ced3fd41b18..fe511ec40bdf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20170630-git''; + version = ''clack-20180328-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; - sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; + url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; + sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL - http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz - MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20170630-git SIBLINGS + 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL + http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz + MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 35fa6046ae51..be88069fd5d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-test''; - version = ''clack-20170630-git''; + version = ''clack-20180328-git''; description = ''Testing Clack Applications.''; - deps = [ args."bordeaux-threads" args."clack" args."dexador" args."flexi-streams" args."http-body" args."lack" args."prove" args."usocket" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; - sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; + url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; + sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; }; packageName = "clack-test"; @@ -18,18 +18,55 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL - http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz - MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-test FILENAME clack-test + 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL + http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz + MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test DEPS - ((NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME clack FILENAME clack) (NAME dexador FILENAME dexador) + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME cl-annot FILENAME cl-annot) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) + (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) + (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http) + (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) - (NAME http-body FILENAME http-body) (NAME lack FILENAME lack) - (NAME prove FILENAME prove) (NAME usocket FILENAME usocket)) + (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) + (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) + (NAME lack-component FILENAME lack-component) + (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) + (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) + (NAME local-time FILENAME local-time) + (NAME named-readtables FILENAME named-readtables) + (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) + (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME smart-buffer FILENAME smart-buffer) + (NAME split-sequence FILENAME split-sequence) + (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-mimes FILENAME trivial-mimes) + (NAME trivial-types FILENAME trivial-types) + (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (bordeaux-threads clack dexador flexi-streams http-body lack prove usocket) - VERSION clack-20170630-git SIBLINGS + (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain + chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie + cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack + dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack + lack-component lack-middleware-backtrace lack-util let-plus local-time + named-readtables nibbles proc-parse prove quri smart-buffer split-sequence + static-vectors trivial-features trivial-garbage trivial-gray-streams + trivial-mimes trivial-types usocket xsubseq) + VERSION clack-20180328-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index bf6b3dbfa652..b810de3fd1c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20170630-git''; + version = ''clack-20180328-git''; description = ''''; - deps = [ args."alexandria" args."bordeaux-threads" args."circular-streams" args."cl-base64" args."cl-ppcre" args."cl-syntax-annot" args."clack" args."clack-test" args."dexador" args."flexi-streams" args."http-body" args."ironclad" args."lack" args."lack-util" args."local-time" args."marshal" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; - sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; + url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; + sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; }; packageName = "clack-v1-compat"; @@ -18,33 +18,58 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL - http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz - MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat FILENAME + 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL + http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz + MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME clack-v1-compat DEPS - ((NAME alexandria FILENAME alexandria) + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME circular-streams FILENAME circular-streams) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors) + (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) + (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME clack FILENAME clack) (NAME clack-test FILENAME clack-test) - (NAME dexador FILENAME dexador) + (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) + (NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador) + (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad) - (NAME lack FILENAME lack) (NAME lack-util FILENAME lack-util) + (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) + (NAME lack-component FILENAME lack-component) + (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) + (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal) + (NAME named-readtables FILENAME named-readtables) + (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) (NAME quri FILENAME quri) + (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-mimes FILENAME trivial-mimes) (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket)) + (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria bordeaux-threads circular-streams cl-base64 cl-ppcre - cl-syntax-annot clack clack-test dexador flexi-streams http-body ironclad - lack lack-util local-time marshal prove quri split-sequence - trivial-backtrace trivial-mimes trivial-types uiop usocket) - VERSION clack-20170630-git SIBLINGS + (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain + chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64 + cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot + cl-utilities clack clack-test dexador fast-http fast-io flexi-streams + http-body ironclad jonathan lack lack-component lack-middleware-backtrace + lack-util let-plus local-time marshal named-readtables nibbles proc-parse + prove quri smart-buffer split-sequence static-vectors trivial-backtrace + trivial-features trivial-garbage trivial-gray-streams trivial-mimes + trivial-types uiop usocket xsubseq) + VERSION clack-20180328-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 26ded8945cd0..08e5ff71cc5c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20170630-git''; + version = ''20180328-git''; description = ''Web application environment for Common Lisp''; - deps = [ args."alexandria" args."bordeaux-threads" args."lack" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz''; - sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg''; + url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz''; + sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai''; }; packageName = "clack"; @@ -18,17 +18,20 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL - http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz - MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack FILENAME clack DEPS + 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL + http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz + MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME lack FILENAME lack) + (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) + (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop)) + (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles) + (NAME uiop FILENAME uiop)) DEPENDENCIES - (alexandria bordeaux-threads lack lack-middleware-backtrace lack-util uiop) - VERSION 20170630-git SIBLINGS + (alexandria bordeaux-threads ironclad lack lack-component + lack-middleware-backtrace lack-util nibbles uiop) + VERSION 20180328-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 3ecc0e101498..312d0eb10a44 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20180131-git''; + version = ''20180430-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz''; - sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz''; + sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL - http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz - MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ + SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL + http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz + MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index 6cc6c24c3b93..303d43a964ee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -7,7 +7,7 @@ rec { description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; @@ -28,11 +28,12 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) + (NAME cl-paths FILENAME cl-paths) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store) (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf)) DEPENDENCIES - (alexandria bordeaux-threads cl-aa cl-fad cl-paths-ttf cl-store cl-vectors - clx trivial-features zpb-ttf) + (alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store + cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL PARASITES (clx-truetype-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 2a7ec984e7fb..bd2b0ff19bdb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20171227-git''; + version = ''20180430-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz''; - sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri''; + url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz''; + sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL - http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5 - 40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git + 18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL + http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5 + bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix new file mode 100644 index 000000000000..ba523ae837d7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -0,0 +1,53 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors-simple-tree''; + version = ''css-selectors-20160628-git''; + + description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors-simple-tree"; + + asdFilesToKeep = ["css-selectors-simple-tree.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors-simple-tree DESCRIPTION + An implementation of css selectors that interacts with cl-html5-parser's simple-tree + SHA256 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-simple-tree + FILENAME css-selectors-simple-tree DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-html5-parser FILENAME cl-html5-parser) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) + (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) + (NAME string-case FILENAME string-case) (NAME swank FILENAME swank) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors css-selectors cxml + cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri + split-sequence string-case swank symbol-munger trivial-features + trivial-gray-streams yacc) + VERSION css-selectors-20160628-git SIBLINGS + (css-selectors-stp css-selectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix new file mode 100644 index 000000000000..fbe06a179fdd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -0,0 +1,52 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors-stp''; + version = ''css-selectors-20160628-git''; + + description = ''An implementation of css selectors that interacts with cxml-stp''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors-stp"; + + asdFilesToKeep = ["css-selectors-stp.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors-stp DESCRIPTION + An implementation of css selectors that interacts with cxml-stp SHA256 + 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-stp FILENAME + css-selectors-stp DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) + (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test) + (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop + closure-common closure-html collectors css-selectors cxml cxml-dom + cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number + puri split-sequence swank symbol-munger trivial-features + trivial-gray-streams xpath yacc) + VERSION css-selectors-20160628-git SIBLINGS + (css-selectors-simple-tree css-selectors) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 52444db0e798..6dfa61634f2b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20180131-git''; + version = ''cl-dbi-20180430-git''; description = ''Database driver for MySQL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; - sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; + sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL - http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz - MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS + 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL + http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz + MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) @@ -35,5 +35,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax cl-syntax-annot closer-mop dbi named-readtables split-sequence trivial-features trivial-types) - VERSION cl-dbi-20180131-git SIBLINGS + VERSION cl-dbi-20180430-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 4dc4683ff9a0..bb9558fda51e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20180131-git''; + version = ''cl-dbi-20180430-git''; description = ''Database driver for PostgreSQL.''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; - sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; + sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL - http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz - MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-postgres FILENAME + 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL + http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz + MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -37,5 +37,5 @@ rec { (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot closer-mop dbi md5 named-readtables split-sequence trivial-garbage trivial-types usocket) - VERSION cl-dbi-20180131-git SIBLINGS + VERSION cl-dbi-20180430-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index cce90acfdf9c..6e8e85e72abc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20180131-git''; + version = ''cl-dbi-20180430-git''; description = ''Database driver for SQLite3.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; - sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; + sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL - http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz - MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL + http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz + MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -38,5 +38,5 @@ rec { (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot closer-mop dbi iterate named-readtables split-sequence sqlite trivial-features trivial-types uiop) - VERSION cl-dbi-20180131-git SIBLINGS + VERSION cl-dbi-20180430-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 31a48ea807b4..e75961dd9ace 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20180131-git''; + version = ''cl-20180430-git''; description = ''Database independent interface for Common Lisp''; deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz''; - sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz''; + sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL - http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz - MD5 7dacf1c276fab38b952813795ff1f707 NAME dbi FILENAME dbi DEPS + SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL + http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz + MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) @@ -32,5 +32,5 @@ rec { DEPENDENCIES (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop named-readtables split-sequence trivial-types) - VERSION cl-20180131-git SIBLINGS + VERSION cl-20180430-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index f03a95d27b1f..d3111b18b22b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20171130-git''; + version = ''20180328-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; - sha256 = ''0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd''; + url = ''http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz''; + sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb''; }; packageName = "dexador"; @@ -18,16 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd URL - http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz - MD5 e1b5154f2169708e2f351707a2bc135f NAME dexador FILENAME dexador DEPS + 13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL + http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz + MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) @@ -42,9 +43,9 @@ rec { (NAME trivial-mimes FILENAME trivial-mimes) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel chipz chunga cl+ssl - cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http - fast-io flexi-streams local-time proc-parse quri smart-buffer + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz + chunga cl+ssl cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities + fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20171130-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 0c3470d755cf..7ee5f91a1580 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20180131-git''; + version = ''20180228-git''; description = ''A few simple tools to help you with documenting your library.''; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz''; - sha256 = ''0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz''; + sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w''; }; packageName = "documentation-utils"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm URL - http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz - MD5 375dbb8ce48543fce1526eeea8d2a976 NAME documentation-utils FILENAME + 0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL + http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz + MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20180131-git SIBLINGS NIL PARASITES + DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index b9f17a5d241f..36411ca05753 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20180131-git''; + version = ''20180430-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz''; - sha256 = ''1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc''; + url = ''http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz''; + sha256 = ''1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc URL - http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz - MD5 89b22e10575198b9f680e0c4e90bec2c NAME esrap FILENAME esrap DEPS + 1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav URL + http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz + MD5 51efcf9b228ebfe63831db8ba797b0e8 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20180131-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20180430-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index f78b7ae0cb69..89bed83acd54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -5,7 +5,7 @@ rec { description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz''; @@ -23,10 +23,11 @@ rec { MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME static-vectors FILENAME static-vectors) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (alexandria babel cffi cffi-grovel static-vectors trivial-features - trivial-gray-streams) + (alexandria babel cffi cffi-grovel cffi-toolchain static-vectors + trivial-features trivial-gray-streams) VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 245ee8b394af..29fd1efe2f5e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20171227-git''; + version = ''20180228-git''; parasites = [ "fiasco-self-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz''; - sha256 = ''1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2''; + url = ''http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz''; + sha256 = ''0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy''; }; packageName = "fiasco"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2 URL - http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz - MD5 3cc915e91f18617eb3d436b6fea9dd49 NAME fiasco FILENAME fiasco DEPS + SHA256 0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy URL + http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz + MD5 a924e43c335836d2e44731dee6a1b8e6 NAME fiasco FILENAME fiasco DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20171227-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ + 20180228-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index 364d62266042..be9648a0da4a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiveam''; - version = ''v1.3''; + version = ''v1.4.1''; parasites = [ "fiveam/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz''; - sha256 = ''0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2''; + url = ''http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz''; + sha256 = ''06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3''; }; packageName = "fiveam"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 - 0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL - http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5 - bd03a588915f834031eeae9139c51aa4 NAME fiveam FILENAME fiveam DEPS + 06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3 URL + http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz MD5 + 7f182f8a4c12b98671e1707ae0f140b7 NAME fiveam FILENAME fiveam DEPS ((NAME alexandria FILENAME alexandria) (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv) (NAME trivial-backtrace FILENAME trivial-backtrace)) DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) - VERSION v1.3 SIBLINGS NIL PARASITES (fiveam/test)) */ + VERSION v1.4.1 SIBLINGS NIL PARASITES (fiveam/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 6e652e8b312e..7b37e5709e86 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''20171227-git''; + version = ''20180328-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz''; - sha256 = ''1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz''; + sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc URL - http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz - MD5 583aa697051062a0d6a6a73923f865d3 NAME flexi-streams FILENAME + SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL + http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz + MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20171227-git SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 604ccf0bdc73..433a31be0d8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -5,7 +5,7 @@ rec { description = ''HTTP POST data parser for Common Lisp''; - deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; @@ -22,19 +22,28 @@ rec { http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) - (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse) - (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer) + (NAME jonathan FILENAME jonathan) + (NAME named-readtables FILENAME named-readtables) + (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) + (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) + (NAME static-vectors FILENAME static-vectors) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http - fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence - trivial-features trivial-gray-streams xsubseq) + (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre + cl-syntax cl-syntax-annot cl-utilities fast-http fast-io flexi-streams + jonathan named-readtables proc-parse quri smart-buffer split-sequence + static-vectors trivial-features trivial-gray-streams trivial-types + xsubseq) VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index a3d8f6133a00..a74f24f8642f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20170630-darcs''; + version = ''20180228-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz''; - sha256 = ''151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz''; + sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld''; }; packageName = "hu.dwim.asdf"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. - SHA256 151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL - http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz - MD5 b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf FILENAME + SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL + http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz + MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20170630-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ + VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index ce3508da8165..c4ae44cd6761 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -7,10 +7,10 @@ rec { description = ''I/O library.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -21,13 +21,14 @@ rec { } /* (SYSTEM iolib DESCRIPTION I/O library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib FILENAME iolib DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME idna FILENAME idna) (NAME iolib.asdf FILENAME iolib_dot_asdf) (NAME iolib.base FILENAME iolib_dot_base) + (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) (NAME iolib.conf FILENAME iolib_dot_conf) (NAME iolib.grovel FILENAME iolib_dot_grovel) (NAME split-sequence FILENAME split-sequence) @@ -35,7 +36,8 @@ rec { (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel bordeaux-threads cffi idna iolib.asdf iolib.base - iolib.conf iolib.grovel split-sequence swap-bytes trivial-features) + iolib.common-lisp iolib.conf iolib.grovel split-sequence swap-bytes + trivial-features) VERSION v0.8.3 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index f566d159e0f5..195b52c08c45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM iolib.asdf DESCRIPTION A few ASDF component classes. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.asdf FILENAME iolib_dot_asdf DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION iolib-v0.8.3 SIBLINGS diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index c42eb7e602b0..aa650edde020 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM iolib.base DESCRIPTION Base IOlib package, used instead of CL. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.base FILENAME iolib_dot_base DEPS ((NAME alexandria FILENAME alexandria) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index 1171ae0f391d..c0ec72d48695 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM iolib.common-lisp DESCRIPTION Slightly modified Common Lisp. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.common-lisp FILENAME iolib_dot_common-lisp DEPS ((NAME alexandria FILENAME alexandria) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 2dc99c742a4e..4ba0cfa1ce2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -8,7 +8,7 @@ rec { deps = [ args."alexandria" args."iolib_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM iolib.conf DESCRIPTION Compile-time configuration for IOLib. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.conf FILENAME iolib_dot_conf DEPS ((NAME alexandria FILENAME alexandria) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index d6c97ad7838a..7a1a12243fe2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -5,10 +5,10 @@ rec { description = ''The CFFI Groveller''; - deps = [ args."alexandria" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."split-sequence" args."uiop" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz''; + url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; }; @@ -19,16 +19,20 @@ rec { } /* (SYSTEM iolib.grovel DESCRIPTION The CFFI Groveller SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 + http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.grovel FILENAME iolib_dot_grovel DEPS - ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) - (NAME iolib.asdf FILENAME iolib_dot_asdf) + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME iolib.asdf FILENAME iolib_dot_asdf) (NAME iolib.base FILENAME iolib_dot_base) + (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) (NAME iolib.conf FILENAME iolib_dot_conf) - (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop)) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME uiop FILENAME uiop)) DEPENDENCIES - (alexandria cffi iolib.asdf iolib.base iolib.conf split-sequence uiop) + (alexandria babel cffi iolib.asdf iolib.base iolib.common-lisp iolib.conf + split-sequence trivial-features uiop) VERSION iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.tests) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 578b251ecec2..8061f3844e0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.37''; + version = ''v0.39''; parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ args."nibbles" ]; + deps = [ args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz''; - sha256 = ''061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2''; + url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz''; + sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8''; }; packageName = "ironclad"; @@ -21,8 +21,9 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2 URL - http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz - MD5 9d8734764eead79f3a5d230b8e800d8f NAME ironclad FILENAME ironclad DEPS - ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.37 - SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ + 0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL + http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz + MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS + ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES + (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES + (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 645048c71909..f276ec72736d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''iterate''; - version = ''20180131-darcs''; + version = ''20180228-git''; parasites = [ "iterate/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz''; - sha256 = ''05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj''; + url = ''http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz''; + sha256 = ''0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib''; }; packageName = "iterate"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 - 05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj URL - http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz - MD5 40a1776b445e42463c2c6f754468fb83 NAME iterate FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION 20180131-darcs SIBLINGS NIL PARASITES + 0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib URL + http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz + MD5 ee3b198b0f9674c11e5283e56f57ed78 NAME iterate FILENAME iterate DEPS NIL + DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES (iterate/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix index 978e58d26925..9a4681894818 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''ixf''; - version = ''cl-20170630-git''; + version = ''cl-20180228-git''; description = ''Tools to handle IBM PC version of IXF file format''; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz''; - sha256 = ''1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2''; + url = ''http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz''; + sha256 = ''1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs''; }; packageName = "ixf"; @@ -18,13 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format - SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL - http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz - MD5 51db2caba094cac90982396cf552c847 NAME ixf FILENAME ixf DEPS + SHA256 1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs URL + http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz + MD5 23732795aa317d24c1a40cc321a0e394 NAME ixf FILENAME ixf DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME ieee-floats FILENAME ieee-floats) (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) - (NAME split-sequence FILENAME split-sequence)) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES - (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence) - VERSION cl-20170630-git SIBLINGS NIL PARASITES NIL) */ + (alexandria babel bordeaux-threads cl-fad cl-ppcre ieee-floats local-time + md5 split-sequence trivial-features) + VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 8a4d21575157..ae323790ba06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20170630-git''; + version = ''20180430-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; - deps = [ args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."proc-parse" args."trivial-types" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz''; - sha256 = ''0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm''; + url = ''http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz''; + sha256 = ''0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0''; }; packageName = "jonathan"; @@ -19,15 +19,24 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL - http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz - MD5 5d82723835164f4e3d9c4d031322eb98 NAME jonathan FILENAME jonathan DEPS - ((NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-syntax FILENAME cl-syntax) + SHA256 0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0 URL + http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz + MD5 7dc695be1b571f19aa9cd2b13aa231bb NAME jonathan FILENAME jonathan DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) + (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME fast-io FILENAME fast-io) (NAME proc-parse FILENAME proc-parse) + (NAME fast-io FILENAME fast-io) + (NAME named-readtables FILENAME named-readtables) + (NAME proc-parse FILENAME proc-parse) + (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-types FILENAME trivial-types)) DEPENDENCIES - (babel cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io proc-parse - trivial-types) - VERSION 20170630-git SIBLINGS (jonathan-test) PARASITES NIL) */ + (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre + cl-syntax cl-syntax-annot fast-io named-readtables proc-parse + static-vectors trivial-features trivial-gray-streams trivial-types) + VERSION 20180430-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 408ef5dfabc9..4dfdce68bc8a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20180131-git''; + version = ''lack-20180430-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; - sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; + url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; + sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL - http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 - e1807a22a021ca27d8d1add9219091eb NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180131-git SIBLINGS + 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL + http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 + b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index a6816fa75c5c..c0acbc2f01fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20180131-git''; + version = ''lack-20180430-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; - sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; + url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; + sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL - http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 - e1807a22a021ca27d8d1add9219091eb NAME lack-middleware-backtrace FILENAME + 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL + http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 + b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20180131-git SIBLINGS + (uiop) VERSION lack-20180430-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index a056d9d0d146..29fcd359f6b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20180131-git''; + version = ''lack-20180430-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; - sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; + url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; + sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL - http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 - e1807a22a021ca27d8d1add9219091eb NAME lack-util FILENAME lack-util DEPS + 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL + http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 + b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20180131-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 1c3998a3025c..9260b06dd830 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20180131-git''; + version = ''20180430-git''; description = ''A minimal Clack''; deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz''; - sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl''; + url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz''; + sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL - http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5 - e1807a22a021ca27d8d1add9219091eb NAME lack FILENAME lack DEPS + 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL + http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5 + b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS ((NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION - 20180131-git SIBLINGS + 20180430-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 0b2556b2572d..a123b7ed3c02 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20180131-git''; + version = ''20180228-git''; parasites = [ "local-time/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz''; - sha256 = ''1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz''; + sha256 = ''0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1''; }; packageName = "local-time"; @@ -21,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr URL - http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz - MD5 61982a1f2b29793e00369d9c2b6d1b12 NAME local-time FILENAME local-time + SHA256 0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1 URL + http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz + MD5 6bb475cb979c4ba004ef4f4c970dec47 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20180131-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + 20180228-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4d17bd6341f2..4f6842606b45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''marshal''; - version = ''cl-20170830-git''; + version = ''cl-20180328-git''; description = ''marshal: Simple (de)serialization of Lisp datastructures.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz''; - sha256 = ''1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp''; + url = ''http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz''; + sha256 = ''09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd''; }; packageName = "marshal"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp URL - http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz - MD5 54bce031cdb215cd7624fdf3265b9bec NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20170830-git SIBLINGS (marshal-tests) PARASITES + 09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd URL + http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz + MD5 2d13dd2a276f1e63965498d10d9406ce NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20180328-git SIBLINGS (marshal-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 472205924a9c..953dd0a58a4a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''md5''; - version = ''20170630-git''; + version = ''20180228-git''; description = ''The MD5 Message-Digest Algorithm RFC 1321''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz''; - sha256 = ''0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx''; + url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz''; + sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4''; }; packageName = "md5"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 - 0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL - http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5 - c6a5b3ca5a23fad3dfde23963db84910 NAME md5 FILENAME md5 DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ + 1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4 URL + http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz MD5 + 7f250f8a2487e4e0aac1ed9c50b79b4d NAME md5 FILENAME md5 DEPS NIL + DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix index 565003d1e877..470d2fed738c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''mssql''; - version = ''cl-20170630-git''; + version = ''cl-20180228-git''; description = ''''; - deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."garbage-pools" args."iterate" args."parse-number" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz''; - sha256 = ''0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy''; + url = ''http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz''; + sha256 = ''1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0''; }; packageName = "mssql"; @@ -18,10 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM mssql DESCRIPTION NIL SHA256 - 0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL - http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz - MD5 88e65c72923896df603ecf20039ae305 NAME mssql FILENAME mssql DEPS - ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) - (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)) - DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION - cl-20170630-git SIBLINGS NIL PARASITES NIL) */ + 1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0 URL + http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz + MD5 03a269f5221948393643432fc6de9d5d NAME mssql FILENAME mssql DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) + (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (alexandria babel cffi garbage-pools iterate parse-number trivial-features) + VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index 9275e5583f56..d706bc5bad1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20171130-git''; + version = ''20180430-git''; parasites = [ "nibbles/tests" ]; description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; - deps = [ ]; + deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz''; - sha256 = ''05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn''; + url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz''; + sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn URL - http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz - MD5 edce3702da9979fca3e40a4594fe36e6 NAME nibbles FILENAME nibbles DEPS NIL - DEPENDENCIES NIL VERSION 20171130-git SIBLINGS NIL PARASITES - (nibbles/tests)) */ + SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL + http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz + MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL + PARASITES (nibbles/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index d998ed305bb5..e636df0805e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''parse-number''; - version = ''1.4''; + version = ''v1.7''; - parasites = [ "parse-number-tests" ]; + parasites = [ "parse-number/tests" ]; description = ''Number parsing library''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz''; - sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh''; + url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz''; + sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha''; }; packageName = "parse-number"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 - 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL - http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz - MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number FILENAME - parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL PARASITES - (parse-number-tests)) */ + 11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha URL + http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz + MD5 b9ec925018b8f10193d73403873dde8f NAME parse-number FILENAME + parse-number DEPS NIL DEPENDENCIES NIL VERSION v1.7 SIBLINGS NIL PARASITES + (parse-number/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 02bb16e0b78d..2bde901ad43e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20180131-git''; + version = ''20180228-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz''; - sha256 = ''12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis''; + url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz''; + sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis URL - http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz - MD5 b9e7e174b2322b6547bca7beddda6f3b NAME plump FILENAME plump DEPS + 0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL + http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz + MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20180131-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index 441f78171098..ba7bef260c08 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''postmodern''; - version = ''20180131-git''; + version = ''20180430-git''; parasites = [ "postmodern/tests" ]; description = ''PostgreSQL programming API''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; - sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; + sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; }; packageName = "postmodern"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL - http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz - MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME postmodern FILENAME postmodern + 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL + http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz + MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -30,13 +30,14 @@ rec { (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) + (NAME s-sql/tests FILENAME s-sql_slash_tests) (NAME simple-date FILENAME simple-date) (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) DEPENDENCIES (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop - fiveam md5 s-sql simple-date simple-date/postgres-glue split-sequence - usocket) - VERSION 20180131-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + fiveam md5 s-sql s-sql/tests simple-date simple-date/postgres-glue + split-sequence usocket) + VERSION 20180430-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES (postmodern/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index e0e6bdc0f172..4f6946783939 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''puri''; - version = ''20150923-git''; + version = ''20180228-git''; parasites = [ "puri-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz''; - sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa''; + url = ''http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz''; + sha256 = ''1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz''; }; packageName = "puri"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library - SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL - http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5 - 3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri FILENAME puri DEPS + SHA256 1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz URL + http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz MD5 + 0c43ad5d862ed0d18ef84d8e2a42f67f NAME puri FILENAME puri DEPS ((NAME ptester FILENAME ptester)) DEPENDENCIES (ptester) VERSION - 20150923-git SIBLINGS NIL PARASITES (puri-tests)) */ + 20180228-git SIBLINGS NIL PARASITES (puri-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 45300754647e..da8cb466b412 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -5,7 +5,7 @@ rec { description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; @@ -25,6 +25,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs) (NAME cl-ppcre FILENAME cl-ppcre) @@ -36,7 +37,7 @@ rec { (NAME trivial-features FILENAME trivial-features) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-fuse-meta-fs - cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue - trivial-backtrace trivial-features trivial-utf-8) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse + cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall + pcall-queue trivial-backtrace trivial-features trivial-utf-8) VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index 83d835fe2dd8..c283abd479ed 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''s-sql''; - version = ''postmodern-20180131-git''; + version = ''postmodern-20180430-git''; + + parasites = [ "s-sql/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."md5" args."split-sequence" args."usocket" ]; + deps = [ args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."postmodern" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; - sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; + sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; }; packageName = "s-sql"; @@ -18,12 +20,18 @@ rec { overrides = x: x; } /* (SYSTEM s-sql DESCRIPTION NIL SHA256 - 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL - http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz - MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME s-sql FILENAME s-sql DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5) + 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL + http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz + MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME s-sql FILENAME s-sql DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-postgres FILENAME cl-postgres) + (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) + (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) + (NAME md5 FILENAME md5) (NAME postmodern FILENAME postmodern) (NAME split-sequence FILENAME split-sequence) (NAME usocket FILENAME usocket)) - DEPENDENCIES (cl-postgres md5 split-sequence usocket) VERSION - postmodern-20180131-git SIBLINGS (cl-postgres postmodern simple-date) - PARASITES NIL) */ + DEPENDENCIES + (bordeaux-threads cl-postgres cl-postgres/tests closer-mop fiveam md5 + postmodern split-sequence usocket) + VERSION postmodern-20180430-git SIBLINGS + (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index d718b1293106..07b1498f2e3f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20180131-git''; + version = ''postmodern-20180430-git''; parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz''; - sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki''; + url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; + sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL - http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz - MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME simple-date FILENAME simple-date + 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL + http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz + MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date DEPS ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION - postmodern-20180131-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index e9d1fc5f305d..4db468081da8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,9 +1,9 @@ args @ { fetchurl, ... }: rec { baseName = ''split-sequence''; - version = ''1.2''; + version = ''v1.4.1''; - parasites = [ "split-sequence-tests" ]; + parasites = [ "split-sequence/tests" ]; description = ''Splits a sequence into a list of subsequences delimited by objects satisfying a test.''; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz''; - sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l''; + url = ''http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz''; + sha256 = ''04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q''; }; packageName = "split-sequence"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences delimited by objects satisfying a test. - SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL - http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz - MD5 194e24d60f0fba70a059633960052e21 NAME split-sequence FILENAME + SHA256 04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q URL + http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz + MD5 b85e3ef2bc2cb2ce8a2c101759539ba7 NAME split-sequence FILENAME split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION 1.2 SIBLINGS NIL PARASITES (split-sequence-tests)) */ + VERSION v1.4.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index b07feca16b00..1cd4e4c44027 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -7,7 +7,7 @@ rec { description = ''Create vectors allocated in static memory.''; - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ]; + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz''; @@ -27,7 +27,9 @@ rec { static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME fiveam FILENAME fiveam) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features) + DEPENDENCIES + (alexandria babel cffi cffi-grovel cffi-toolchain fiveam trivial-features) VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 5191e2f336d8..883e648a2f68 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20180131-git''; + version = ''20180430-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz''; - sha256 = ''1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz''; + sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0 URL - http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz - MD5 252427acf3f2dbc2a5522598c4e37be1 NAME stumpwm FILENAME stumpwm DEPS + 0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL + http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz + MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180131-git SIBLINGS NIL + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 53d6be525f69..dd93a599d699 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; - version = ''20140826-git''; + version = ''20180328-git''; description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz''; - sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92''; + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz''; + sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f''; }; packageName = "trivial-gray-streams"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). - SHA256 1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL - http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz - MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME trivial-gray-streams FILENAME - trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git + SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz + MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME + trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 3e8d4155ce3d..1986f7c88f7a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uffi''; - version = ''20170630-git''; + version = ''20180228-git''; description = ''Universal Foreign Function Library for Common Lisp''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz''; - sha256 = ''1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf''; + url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz''; + sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479''; }; packageName = "uffi"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp - SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL - http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5 - 8ac448122b79a41ec2b0647f06af7c12 NAME uffi FILENAME uffi DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests) PARASITES NIL) */ + SHA256 1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479 URL + http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz MD5 + b0dfb2f966912f4797327948aa7e9119 NAME uffi FILENAME uffi DEPS NIL + DEPENDENCIES NIL VERSION 20180228-git SIBLINGS (uffi-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index fb483662df53..cc5c23faf862 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -5,7 +5,7 @@ rec { description = ''An asynchronous HTTP server written in Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz''; @@ -24,6 +24,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME cl-utilities FILENAME cl-utilities) (NAME clack-socket FILENAME clack-socket) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) @@ -38,8 +39,8 @@ rec { (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities - clack-socket fast-http fast-io flexi-streams lev proc-parse quri - smart-buffer split-sequence static-vectors swap-bytes trivial-features - trivial-gray-streams trivial-utf-8 uiop vom xsubseq) + (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain + cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse + quri smart-buffer split-sequence static-vectors swap-bytes + trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq) VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index a64ff45a1879..8c4afa9697d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''wookie''; - version = ''20170227-git''; + version = ''20180228-git''; description = ''An evented webserver for Common Lisp.''; - deps = [ args."alexandria" args."babel" args."blackbird" args."chunga" args."cl-async" args."cl-async-ssl" args."cl-fad" args."cl-ppcre" args."do-urlencode" args."fast-http" args."fast-io" args."quri" args."vom" ]; + deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz''; - sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0''; + url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz''; + sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq''; }; packageName = "wookie"; @@ -18,18 +18,35 @@ rec { overrides = x: x; } /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 - 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL - http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz - MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie FILENAME wookie DEPS + 1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL + http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz + MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga) - (NAME cl-async FILENAME cl-async) - (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad) - (NAME cl-ppcre FILENAME cl-ppcre) + (NAME babel-streams FILENAME babel-streams) + (NAME blackbird FILENAME blackbird) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) + (NAME chunga FILENAME chunga) (NAME cl-async FILENAME cl-async) + (NAME cl-async-base FILENAME cl-async-base) + (NAME cl-async-ssl FILENAME cl-async-ssl) + (NAME cl-async-util FILENAME cl-async-util) (NAME cl-fad FILENAME cl-fad) + (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-utilities FILENAME cl-utilities) (NAME do-urlencode FILENAME do-urlencode) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) - (NAME quri FILENAME quri) (NAME vom FILENAME vom)) + (NAME flexi-streams FILENAME flexi-streams) + (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) + (NAME smart-buffer FILENAME smart-buffer) + (NAME split-sequence FILENAME split-sequence) + (NAME static-vectors FILENAME static-vectors) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre - do-urlencode fast-http fast-io quri vom) - VERSION 20170227-git SIBLINGS NIL PARASITES NIL) */ + (alexandria babel babel-streams blackbird bordeaux-threads cffi cffi-grovel + cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util + cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io + flexi-streams proc-parse quri smart-buffer split-sequence static-vectors + trivial-features trivial-gray-streams vom xsubseq) + VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index d9df8c752961..0fd076509c22 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''xmls''; - version = ''1.7''; + version = ''3.0.2''; - parasites = [ "xmls/test" ]; + parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ]; description = ''''; - deps = [ ]; + deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz''; - sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b''; + url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz''; + sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi''; }; packageName = "xmls"; @@ -20,7 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM xmls DESCRIPTION NIL SHA256 - 1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL - http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz MD5 - 697c9f49a60651b759e24ea0c1eb1cfe NAME xmls FILENAME xmls DEPS NIL - DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL PARASITES (xmls/test)) */ + 1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL + http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5 + 2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) (NAME fiveam FILENAME fiveam) + (NAME flexi-streams FILENAME flexi-streams)) + DEPENDENCIES (cl-ppcre fiveam flexi-streams) VERSION 3.0.2 SIBLINGS NIL + PARASITES (xmls/octets xmls/test xmls/unit-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index b133c3009ae6..babfba3f653d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -61,6 +61,8 @@ xembed command-line-arguments css-lite css-selectors +css-selectors-simple-tree +css-selectors-stp cxml dbd-mysql dbd-postgres diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 8ea7d4700bd6..8d150cc29b3c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,6 +6,9 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql"; + + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; @@ -18,17 +21,6 @@ let quicklisp-to-nix-packages = rec { })); - "iolib_dot_common-lisp" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_common-lisp" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; - "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; - })); - - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; @@ -40,14 +32,6 @@ let quicklisp-to-nix-packages = rec { })); - "rt" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."rt" or (x: {})) - (import ./quicklisp-to-nix-output/rt.nix { - inherit fetchurl; - })); - - "clack-socket" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clack-socket" or (x: {})) @@ -84,8 +68,13 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."s-sql" or (x: {})) (import ./quicklisp-to-nix-output/s-sql.nix { inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; + "postmodern" = quicklisp-to-nix-packages."postmodern"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -138,6 +127,7 @@ let quicklisp-to-nix-packages = rec { "fiveam" = quicklisp-to-nix-packages."fiveam"; "md5" = quicklisp-to-nix-packages."md5"; "s-sql" = quicklisp-to-nix-packages."s-sql"; + "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests"; "simple-date" = quicklisp-to-nix-packages."simple-date"; "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -150,10 +140,13 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."mssql" or (x: {})) (import ./quicklisp-to-nix-output/mssql.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "garbage-pools" = quicklisp-to-nix-packages."garbage-pools"; "iterate" = quicklisp-to-nix-packages."iterate"; "parse-number" = quicklisp-to-nix-packages."parse-number"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; })); @@ -191,11 +184,14 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "ieee-floats" = quicklisp-to-nix-packages."ieee-floats"; "local-time" = quicklisp-to-nix-packages."local-time"; "md5" = quicklisp-to-nix-packages."md5"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; })); @@ -289,10 +285,10 @@ let quicklisp-to-nix-packages = rec { })); - "lack-component" = buildLispPackage + "rt" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."lack-component" or (x: {})) - (import ./quicklisp-to-nix-output/lack-component.nix { + (qlOverrides."rt" or (x: {})) + (import ./quicklisp-to-nix-output/rt.nix { inherit fetchurl; })); @@ -303,11 +299,14 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -322,6 +321,17 @@ let quicklisp-to-nix-packages = rec { })); + "iolib_dot_common-lisp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_common-lisp" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + })); + + "iolib_dot_base" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."iolib_dot_base" or (x: {})) @@ -344,28 +354,6 @@ let quicklisp-to-nix-packages = rec { })); - "xpath" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."xpath" or (x: {})) - (import ./quicklisp-to-nix-output/xpath.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - "puri" = quicklisp-to-nix-packages."puri"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "yacc" = quicklisp-to-nix-packages."yacc"; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -374,46 +362,6 @@ let quicklisp-to-nix-packages = rec { })); - "cxml-stp" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cxml-stp" or (x: {})) - (import ./quicklisp-to-nix-output/cxml-stp.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - "puri" = quicklisp-to-nix-packages."puri"; - "rt" = quicklisp-to-nix-packages."rt"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "xpath" = quicklisp-to-nix-packages."xpath"; - "yacc" = quicklisp-to-nix-packages."yacc"; - })); - - - "jonathan" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."jonathan" or (x: {})) - (import ./quicklisp-to-nix-output/jonathan.nix { - inherit fetchurl; - "babel" = quicklisp-to-nix-packages."babel"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - "net_dot_didierverna_dot_asdf-flv" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {})) @@ -422,15 +370,6 @@ let quicklisp-to-nix-packages = rec { })); - "chunga" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."chunga" or (x: {})) - (import ./quicklisp-to-nix-output/chunga.nix { - inherit fetchurl; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "sqlite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."sqlite" or (x: {})) @@ -457,6 +396,52 @@ let quicklisp-to-nix-packages = rec { })); + "xpath" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xpath" or (x: {})) + (import ./quicklisp-to-nix-output/xpath.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "puri" = quicklisp-to-nix-packages."puri"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + + "cxml-stp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-stp" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-stp.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "puri" = quicklisp-to-nix-packages."puri"; + "rt" = quicklisp-to-nix-packages."rt"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "xpath" = quicklisp-to-nix-packages."xpath"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "yacc" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."yacc" or (x: {})) @@ -645,15 +630,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-garbage" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-garbage" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-garbage.nix { - inherit fetchurl; - "rt" = quicklisp-to-nix-packages."rt"; - })); - - "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre"; @@ -812,53 +788,6 @@ let quicklisp-to-nix-packages = rec { "cl-async-util" = quicklisp-to-nix-packages."cl-async"; - "clack-test" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack-test" or (x: {})) - (import ./quicklisp-to-nix-output/clack-test.nix { - inherit fetchurl; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "clack" = quicklisp-to-nix-packages."clack"; - "dexador" = quicklisp-to-nix-packages."dexador"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "lack" = quicklisp-to-nix-packages."lack"; - "prove" = quicklisp-to-nix-packages."prove"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "lack-util" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lack-util" or (x: {})) - (import ./quicklisp-to-nix-output/lack-util.nix { - inherit fetchurl; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - })); - - - "lack-middleware-backtrace" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lack-middleware-backtrace" or (x: {})) - (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix { - inherit fetchurl; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - - "cffi-toolchain" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cffi-toolchain" or (x: {})) - (import ./quicklisp-to-nix-output/cffi-toolchain.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - })); - - "uiop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uiop" or (x: {})) @@ -875,6 +804,15 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-garbage" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-garbage" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-garbage.nix { + inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -907,6 +845,57 @@ let quicklisp-to-nix-packages = rec { })); + "lack-util" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-util" or (x: {})) + (import ./quicklisp-to-nix-output/lack-util.nix { + inherit fetchurl; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + })); + + + "lack-middleware-backtrace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-middleware-backtrace" or (x: {})) + (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lack-component" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-component" or (x: {})) + (import ./quicklisp-to-nix-output/lack-component.nix { + inherit fetchurl; + })); + + + "jonathan" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."jonathan" or (x: {})) + (import ./quicklisp-to-nix-output/jonathan.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + "do-urlencode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."do-urlencode" or (x: {})) @@ -920,6 +909,64 @@ let quicklisp-to-nix-packages = rec { })); + "clack-test" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-test" or (x: {})) + (import ./quicklisp-to-nix-output/clack-test.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "dexador" = quicklisp-to-nix-packages."dexador"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "prove" = quicklisp-to-nix-packages."prove"; + "quri" = quicklisp-to-nix-packages."quri"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + })); + + "cl-syntax" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-syntax" or (x: {})) @@ -971,6 +1018,27 @@ let quicklisp-to-nix-packages = rec { })); + "chunga" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chunga" or (x: {})) + (import ./quicklisp-to-nix-output/chunga.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "cffi-toolchain" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi-toolchain" or (x: {})) + (import ./quicklisp-to-nix-output/cffi-toolchain.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "babel-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."babel-streams" or (x: {})) @@ -1031,6 +1099,9 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."xmls" or (x: {})) (import ./quicklisp-to-nix-output/xmls.nix { inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; })); @@ -1050,17 +1121,34 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "blackbird" = quicklisp-to-nix-packages."blackbird"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl-async" = quicklisp-to-nix-packages."cl-async"; + "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; "cl-async-ssl" = quicklisp-to-nix-packages."cl-async-ssl"; + "cl-async-util" = quicklisp-to-nix-packages."cl-async-util"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; "fast-http" = quicklisp-to-nix-packages."fast-http"; "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "quri" = quicklisp-to-nix-packages."quri"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "vom" = quicklisp-to-nix-packages."vom"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1074,6 +1162,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack-socket" = quicklisp-to-nix-packages."clack-socket"; "fast-http" = quicklisp-to-nix-packages."fast-http"; @@ -1182,6 +1271,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "fiveam" = quicklisp-to-nix-packages."fiveam"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; })); @@ -1239,6 +1329,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; @@ -1397,6 +1488,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."nibbles" or (x: {})) (import ./quicklisp-to-nix-output/nibbles.nix { inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; })); @@ -1508,6 +1600,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/ironclad.nix { inherit fetchurl; "nibbles" = quicklisp-to-nix-packages."nibbles"; + "rt" = quicklisp-to-nix-packages."rt"; })); @@ -1523,6 +1616,7 @@ let quicklisp-to-nix-packages = rec { "idna" = quicklisp-to-nix-packages."idna"; "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; "iolib_dot_grovel" = quicklisp-to-nix-packages."iolib_dot_grovel"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -1596,20 +1690,27 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-annot" = quicklisp-to-nix-packages."cl-annot"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "fast-http" = quicklisp-to-nix-packages."fast-http"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "jonathan" = quicklisp-to-nix-packages."jonathan"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "quri" = quicklisp-to-nix-packages."quri"; "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1663,6 +1764,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; @@ -1761,6 +1863,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; @@ -1870,6 +1973,77 @@ let quicklisp-to-nix-packages = rec { })); + "css-selectors-stp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors-stp" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors-stp.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "css-selectors" = quicklisp-to-nix-packages."css-selectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-stp" = quicklisp-to-nix-packages."cxml-stp"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "xpath" = quicklisp-to-nix-packages."xpath"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + + "css-selectors-simple-tree" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors-simple-tree" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors-simple-tree.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-html5-parser" = quicklisp-to-nix-packages."cl-html5-parser"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "css-selectors" = quicklisp-to-nix-packages."css-selectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "css-selectors" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."css-selectors" or (x: {})) @@ -1938,6 +2112,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-aa" = quicklisp-to-nix-packages."cl-aa"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-paths" = quicklisp-to-nix-packages."cl-paths"; "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf"; "cl-store" = quicklisp-to-nix-packages."cl-store"; "cl-vectors" = quicklisp-to-nix-packages."cl-vectors"; @@ -2240,6 +2415,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; })); @@ -2313,6 +2489,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "iterate" = quicklisp-to-nix-packages."iterate"; @@ -2334,6 +2511,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "iterate" = quicklisp-to-nix-packages."iterate"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; @@ -2444,6 +2622,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-async" = quicklisp-to-nix-packages."cl-async"; "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; "cl-async-util" = quicklisp-to-nix-packages."cl-async-util"; @@ -2467,6 +2646,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-async" = quicklisp-to-nix-packages."cl-async"; "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; "cl-async-util" = quicklisp-to-nix-packages."cl-async-util"; @@ -2493,6 +2673,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "fast-io" = quicklisp-to-nix-packages."fast-io"; @@ -2522,29 +2703,60 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/clack-v1-compat.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "clack" = quicklisp-to-nix-packages."clack"; "clack-test" = quicklisp-to-nix-packages."clack-test"; "dexador" = quicklisp-to-nix-packages."dexador"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "http-body" = quicklisp-to-nix-packages."http-body"; "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; "lack-util" = quicklisp-to-nix-packages."lack-util"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; "marshal" = quicklisp-to-nix-packages."marshal"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; "uiop" = quicklisp-to-nix-packages."uiop"; "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -2555,9 +2767,12 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; "lack-util" = quicklisp-to-nix-packages."lack-util"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -2571,6 +2786,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; "fast-io" = quicklisp-to-nix-packages."fast-io"; "static-vectors" = quicklisp-to-nix-packages."static-vectors"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; @@ -2623,36 +2839,62 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-annot" = quicklisp-to-nix-packages."cl-annot"; "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-project" = quicklisp-to-nix-packages."cl-project"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "clack-test" = quicklisp-to-nix-packages."clack-test"; "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; "dexador" = quicklisp-to-nix-packages."dexador"; "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "http-body" = quicklisp-to-nix-packages."http-body"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; "map-set" = quicklisp-to-nix-packages."map-set"; "marshal" = quicklisp-to-nix-packages."marshal"; "myway" = quicklisp-to-nix-packages."myway"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); From a8ed1fc4edb6949c6eb0bdbf773c05f9b4a15a0c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 30 May 2018 19:36:16 +0200 Subject: [PATCH 017/153] Update GCE image for 18.03 (cherry picked from commit 8aa385069f830fc801c8a04d2bd8a70a02be3de4) --- nixos/modules/virtualisation/gce-images.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix index 8a9bda1b60c2..575bbaadbcdb 100644 --- a/nixos/modules/virtualisation/gce-images.nix +++ b/nixos/modules/virtualisation/gce-images.nix @@ -3,6 +3,7 @@ let self = { "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; + "18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz"; - latest = self."17.03"; + latest = self."18.03"; }; in self From 711f96ee1df662ae04a237eddf5fd9f572e4a730 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Wed, 30 May 2018 10:40:18 -0700 Subject: [PATCH 018/153] consul-ui: fix build Update the dependencies used for building consul-ui. therubyracer is no longer required and fails to build. Instead, a nodejs binary is required to build the assets. Patch out unnecessary executions of `bundle` which can cause failures. --- pkgs/servers/consul/Gemfile | 1 - pkgs/servers/consul/Gemfile.lock | 27 +++++----- pkgs/servers/consul/gemset.nix | 57 +++++++++++---------- pkgs/servers/consul/ui-no-bundle-exec.patch | 17 ++++++ pkgs/servers/consul/ui.nix | 8 +-- 5 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 pkgs/servers/consul/ui-no-bundle-exec.patch diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile index 77b884c352dc..0e782af6b000 100644 --- a/pkgs/servers/consul/Gemfile +++ b/pkgs/servers/consul/Gemfile @@ -3,4 +3,3 @@ source "https://rubygems.org" gem "uglifier" gem "sass" -gem "therubyracer" diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock index cc4df6b24309..60a565f66951 100644 --- a/pkgs/servers/consul/Gemfile.lock +++ b/pkgs/servers/consul/Gemfile.lock @@ -1,22 +1,25 @@ GEM remote: https://rubygems.org/ specs: - execjs (2.3.0) - json (1.8.2) - libv8 (3.16.14.11) - ref (1.0.5) - sass (3.4.11) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - uglifier (2.7.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + execjs (2.7.0) + ffi (1.9.23) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + uglifier (4.1.10) + execjs (>= 0.3.0, < 3) PLATFORMS ruby DEPENDENCIES sass - therubyracer uglifier + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix index f87038775be7..2a5425ccf5f5 100644 --- a/pkgs/servers/consul/gemset.nix +++ b/pkgs/servers/consul/gemset.nix @@ -1,59 +1,62 @@ { execjs = { - version = "2.3.0"; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; type = "gem"; - sha256 = "097v02bhmzc70j7n0yyf8j0z5wms88zcmgpmggby4hnvqxf41y1h"; }; + version = "2.7.0"; }; - json = { - version = "1.8.2"; + ffi = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; + version = "1.9.23"; }; - libv8 = { - version = "3.16.14.11"; + rb-fsevent = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; - sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; }; + version = "0.10.3"; }; - ref = { - version = "1.0.5"; + rb-inotify = { + dependencies = ["ffi"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; type = "gem"; - sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; }; + version = "0.9.10"; }; sass = { - version = "3.4.11"; + dependencies = ["sass-listen"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; - sha256 = "10dncnv7g5v8d1xpw2aaarxjjlm68f7nm02ns2kl8nf3yxi6wzdf"; }; + version = "3.5.6"; }; - therubyracer = { - version = "0.12.1"; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; type = "gem"; - sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; }; - dependencies = [ - "libv8" - "ref" - ]; + version = "4.0.0"; }; uglifier = { - version = "2.7.0"; + dependencies = ["execjs"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dycp9c5xiricla6sgvg0vf22i3axs5k1v1607dvl7nv1xkkaczi"; type = "gem"; - sha256 = "1x1mnakx086l83a3alj690c6n8kfmb4bk243a6m6yz99s15gbxfq"; }; - dependencies = [ - "execjs" - "json" - ]; + version = "4.1.10"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/consul/ui-no-bundle-exec.patch b/pkgs/servers/consul/ui-no-bundle-exec.patch new file mode 100644 index 000000000000..5707b871049b --- /dev/null +++ b/pkgs/servers/consul/ui-no-bundle-exec.patch @@ -0,0 +1,17 @@ +diff --git a/ui/scripts/dist.sh b/ui/scripts/dist.sh +index 0ad6e28e..db340da0 100755 +--- a/ui/scripts/dist.sh ++++ b/ui/scripts/dist.sh +@@ -15,10 +15,9 @@ DEPLOY="../pkg/web_ui" + rm -rf $DEPLOY + mkdir -p $DEPLOY + +-bundle check >/dev/null 2>&1 || bundle install +-bundle exec sass styles/base.scss static/base.css ++sass styles/base.scss static/base.css + +-bundle exec ruby scripts/compile.rb ++ruby scripts/compile.rb + + # Copy into deploy + shopt -s dotglob diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index b4cbca22c30a..da9b518bad73 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, consul, ruby, bundlerEnv, zip }: +{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }: let # `sass` et al @@ -13,9 +13,11 @@ stdenv.mkDerivation { src = consul.src; - buildInputs = [ ruby gems zip ]; + buildInputs = [ ruby gems zip nodejs ]; - patchPhase = "patchShebangs ./ui/scripts/dist.sh"; + patches = [ ./ui-no-bundle-exec.patch ]; + + postPatch = "patchShebangs ./ui/scripts/dist.sh"; buildPhase = '' # Build ui static files From 6bced693052c0f305dc290155865a5ce1e8bb201 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 30 May 2018 20:36:52 +0200 Subject: [PATCH 019/153] checkstyle: 8.10 -> 8.10.1 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index cbb33901311b..da60b77934b0 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "8.10"; + version = "8.10.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1n7bqqrd13zqx51dqh160z5sjdc6kr089i505gf405ymmfbx1p3d"; + sha256 = "18i1a6v9dg08in68g584y7bhf76g59pp8lyixqc3v6wgj3ksv8q9"; }; installPhase = '' From 5f7064251b036f88dd780f40024de429a1f077c4 Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Wed, 30 May 2018 19:29:05 +0000 Subject: [PATCH 020/153] tryton: 4.8.0 -> 4.8.2 --- pkgs/applications/office/tryton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 0df9fd899dc5..e44106f7b65e 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -14,10 +14,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "tryton"; - version = "4.8.0"; + version = "4.8.2"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "1ywgna4hhmji8pfrwhdfj1ns49vs9nwppqb7iy7jr27wrxk4bm6b"; + sha256 = "02jnqxwsqk7hn52hc4jd59nd94d810i4psaa3lqqig3br5blp8yx"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = with python2Packages; [ From 93555b0c199d5e1f2025e1792642f99d21dfa69a Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Wed, 30 May 2018 19:29:43 +0000 Subject: [PATCH 021/153] trytond: 4.8.0 -> 4.8.1 --- pkgs/applications/office/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index 31c6a7059fc0..d1b3cb1b1a17 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "trytond"; - version = "4.8.0"; + version = "4.8.1"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "114c0ea15b8395117bf8c669b7da8af4961001297fbd034c780a42a40e079e3a"; + sha256 = "8e72a24bdf2fd090c5e12ce5f73a00322e31519608b31db44d7bb76382078db9"; }; # Tells the tests which database to use From cd213eea7d942f3d6e7889c12bd878d84d61e113 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 30 May 2018 21:40:14 +0200 Subject: [PATCH 022/153] all-packages: remove some duplicate references --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e76602fb3d99..87d70cb53de5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1427,7 +1427,7 @@ with pkgs; czmq = czmq3; }; - rsyslog-light = callPackage ../tools/system/rsyslog { + rsyslog-light = rsyslog.override { libkrb5 = null; systemd = null; jemalloc = null; @@ -2779,7 +2779,7 @@ with pkgs; zfsSupport = false; }; - grub2_xen = callPackage ../tools/misc/grub/2.0x.nix { + grub2_xen = grub2_full.override { xenSupport = true; }; @@ -2952,9 +2952,9 @@ with pkgs; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; - heimdall = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = false; }; + heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; - heimdall-gui = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = true; }; + heimdall-gui = heimdall.override { enableGUI = true; }; hevea = callPackage ../tools/typesetting/hevea { }; From e62bf6dda4f32f6158bd181a95d336883a0acb66 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 30 May 2018 19:40:19 +0000 Subject: [PATCH 023/153] shadowsocks-libev: 3.1.3 -> 3.2.0 Fixes build with CMake 3.11. --- pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index cbbc36b383bf..2823917fc31d 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = "shadowsocks-libev-${version}"; - version = "3.1.3"; + version = "3.2.0"; # Git tag includes CMake build files which are much more convenient. # fetchgit because submodules. src = fetchgit { url = "https://github.com/shadowsocks/shadowsocks-libev"; rev = "refs/tags/v${version}"; - sha256 = "16q91xh6ixfv7b5rl31an11101irv08119klfx5qgj4i6h7c41s7"; + sha256 = "0i9vz5b2c2bkdl2k9kqzvqyrlpdl94lf7k7rzxds8hn2kk0jizhb"; }; buildInputs = [ libsodium mbedtls libev c-ares pcre ]; From b503e76ee0dd94e54c851188f0060765d9419157 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 30 May 2018 21:48:07 +0200 Subject: [PATCH 024/153] use sandbox instead of build-use-sandbox --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 75db8e1377c4..e7a9b1ba25fd 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) +- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) - Built on platform(s) - [ ] NixOS - [ ] macOS From 57bbe4129599b75f587ea9c9789113ac36e49ea4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 30 May 2018 16:06:34 -0400 Subject: [PATCH 025/153] thepeg: fix rivet backend --- pkgs/development/libraries/physics/thepeg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 63db874d8480..0a8ee8f393c3 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-hepmc=${hepmc}" + "--with-rivet=${rivet}" "--without-javagui" ]; From 4342d99d82deee4920ed9b0ee9a44957e23a5fa9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 30 May 2018 16:06:56 -0400 Subject: [PATCH 026/153] herwig: 7.1.2 -> 7.1.3 thepeg: 2.1.2 -> 2.1.3 --- pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- pkgs/development/libraries/physics/thepeg/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index f3ba8a4a6ff6..ce6ea4c56a89 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i"; + sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 0a8ee8f393c3..0a84fe20da72 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va"; + sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; From e2126dfd71a536c0db7c890e94c574afa06f01e7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 30 May 2018 16:23:37 -0400 Subject: [PATCH 027/153] nix-plugins: 4.0.4 -> 4.0.5. Allows building against nix stable. --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index c4a30f52b050..ff8a54f87f2a 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "4.0.4"; in +let version = "4.0.5"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn"; + sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8df999e5bad..c4ab8d37c98b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10850,9 +10850,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = nixUnstable; - }; + nix-plugins = callPackage ../development/libraries/nix-plugins {}; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; From 584006a85e3daed5a8e5719fd6a4d6b82d0252f3 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sat, 12 May 2018 04:19:44 +0400 Subject: [PATCH 028/153] chromium: fix crashpad build --- pkgs/applications/networking/browsers/chromium/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 923084a57385..defbfbd121d1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -198,8 +198,10 @@ let tar -xJf ${freetype_source} # remove unused third-party + # in third_party/crashpad third_party/zlib contains just a header-adapter for lib in ${toString gnSystemLibraries}; do find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ \! -path "*third_party/$lib/chromium/*" \ \! -path "*third_party/$lib/google/*" \ \! -path "*base/third_party/icu/*" \ From 72d7b5ddb14a8b5903f01c7b40f216a0a6149fb8 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sat, 12 May 2018 04:19:56 +0400 Subject: [PATCH 029/153] chromium: fix nix_plugin_paths for 68+ --- .../networking/browsers/chromium/common.nix | 5 +- .../patches/nix_plugin_paths_68.patch | 70 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index defbfbd121d1..4718cc6c1ede 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,12 +138,13 @@ let ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/nix_plugin_paths_52.patch # As major versions are added, you can trawl the gentoo and arch repos at # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optionals (versionRange "66" "68") [ + ./patches/nix_plugin_paths_52.patch ] ++ optionals (versionRange "66" "67") [ (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") @@ -154,6 +155,8 @@ let (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") + ] ++ optionals (versionAtLeast version "68") [ + ./patches/nix_plugin_paths_68.patch ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch new file mode 100644 index 000000000000..c90e98e72fa1 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -0,0 +1,70 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index f4e119d..d9775bd 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -68,21 +68,14 @@ static base::LazyInstance + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return base::PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + // Gets the path for bundled implementations of components. Note that these +@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_COMPONENTS: +@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); From 7acec162261a574e75a0c4e1e11e781923407a2f Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 31 May 2018 00:20:30 +0400 Subject: [PATCH 030/153] chromium: 66.0.3359.181 -> 67.0.3396.62 New stable version, with 34 security fixes and site isolation. See https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop_58.html --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bb080a50bebd..b0da1b5809c2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny"; - sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf"; - version = "67.0.3396.40"; + sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; + sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0"; + version = "67.0.3396.62"; }; dev = { - sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp"; - sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w"; - version = "68.0.3423.2"; + sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc"; + sha256bin64 = "0y69ykzj1phpvmhd380wijzs0f8s15gmvb88zd4m8fzqi6gg51dj"; + version = "68.0.3438.3"; }; stable = { - sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip"; - sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2"; - version = "66.0.3359.181"; + sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; + sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c"; + version = "67.0.3396.62"; }; } From 88007f819d87c21a7be5e3c801f8f319f4515474 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 31 May 2018 00:25:22 +0400 Subject: [PATCH 031/153] chromium: remove outdated patches --- .../networking/browsers/chromium/common.nix | 16 +------------- .../chromium/patches/neon_buildfix.patch | 21 ------------------ .../chromium/patches/skia_buildfix.patch | 22 ------------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4718cc6c1ede..8ab141b5a337 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -145,23 +145,9 @@ let # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") ] ++ optionals (versionRange "66" "68") [ ./patches/nix_plugin_paths_52.patch - ] ++ optionals (versionRange "66" "67") [ - (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") - (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") - # GCC 7 fixes - (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") - (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") - (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") - (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") - (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") - (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch - ] ++ optional enableWideVine ./patches/widevine.patch - ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ - ./patches/skia_buildfix.patch - ./patches/neon_buildfix.patch - ]; + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch deleted file mode 100644 index b44487ca634c..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc -index 26b91b9..cae6bc2 100644 ---- a/skia/ext/convolver_neon.cc -+++ b/skia/ext/convolver_neon.cc - -@@ -23,7 +23,7 @@ - remainder[2] += coeff * pixels_left[i * 4 + 2]; - remainder[3] += coeff * pixels_left[i * 4 + 3]; - } -- return {remainder[0], remainder[1], remainder[2], remainder[3]}; -+ return vld1q_s32(remainder); - } - - // Convolves horizontally along a single row. The row data is given in -@@ -336,4 +336,4 @@ - } - } - --} // namespace skia -\ No newline at end of file -+} // namespace skia diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch deleted file mode 100644 index 5348b9ac905b..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp -=================================================================== ---- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp -+++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp -@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -686,7 +686,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) From e4810965c01db441d0347240ce4eff69d3556d0e Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 31 May 2018 00:33:42 +0400 Subject: [PATCH 032/153] chromium: fix build for 67 --- .../networking/browsers/chromium/common.nix | 2 ++ .../browsers/chromium/patches/fix-freetype.patch | 15 +++++++++++++++ .../browsers/chromium/patches/fix-openh264.patch | 10 ++++++++++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8ab141b5a337..a2d8a24ec5e6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -143,6 +143,8 @@ let # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") + ./patches/fix-openh264.patch + ./patches/fix-freetype.patch ] ++ optionals (versionRange "66" "68") [ ./patches/nix_plugin_paths_52.patch ] ++ optionals (versionAtLeast version "68") [ diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch new file mode 100644 index 000000000000..cc380a55abe0 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch @@ -0,0 +1,15 @@ +--- a/third_party/freetype/BUILD.gn ++++ b/third_party/freetype/BUILD.gn +@@ -63,10 +63,12 @@ source_set("freetype_source") { + "src/src/base/ftbase.c", + "src/src/base/ftbbox.c", + "src/src/base/ftbitmap.c", ++ "src/src/base/ftfntfmt.c", + "src/src/base/ftfstype.c", + "src/src/base/ftgasp.c", + "src/src/base/ftglyph.c", + "src/src/base/ftinit.c", ++ "src/src/base/ftlcdfil.c", + "src/src/base/ftmm.c", + "src/src/base/ftstroke.c", + "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch new file mode 100644 index 000000000000..9d9ed6d2d052 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch @@ -0,0 +1,10 @@ +--- a/third_party/openh264/BUILD.gn ++++ b/third_party/openh264/BUILD.gn +@@ -24,6 +24,7 @@ config("config") { + if (!is_win || is_clang) { + cflags += [ + "-Wno-format", ++ "-Wno-format-security", + "-Wno-header-hygiene", + "-Wno-unused-function", + "-Wno-unused-value", From 129dfedaa94c25fec361819aa4d1752034a4b3ff Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Wed, 30 May 2018 22:10:49 +0100 Subject: [PATCH 033/153] xcode: remove extra quote from message (#41286) --- pkgs/os-specific/darwin/xcode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index bed4cd6490d1..4cfc0874fcd0 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -23,7 +23,7 @@ let requireXcode = version: sha256: message = '' Unfortunately, we cannot download ${name} automatically. Please go to ${url} - to download it yourself, and add it to the Nix store by running the following commands." + to download it yourself, and add it to the Nix store by running the following commands. Note: download (~ 5GB), extraction and storing of Xcode will take a while ${unxip} From a4e732482c1e6a422ec257ce5a228bbe42fc105a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 14:11:42 -0700 Subject: [PATCH 034/153] gitAndTools.transcrypt: 1.0.3 -> 1.1.0 (#41231) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/transcrypt/versions. These checks were done: - built on NixOS - /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/transcrypt passed the binary check. - /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/.transcrypt-wrapped passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 1 of 2 passed binary check by having the new version present in output. - found 1.1.0 with grep in /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0 - directory tree listing: https://gist.github.com/74399ed2dc0f5e79c6face443cf11691 - du listing: https://gist.github.com/6c7f5baa546117396d7b51993bf84dba --- .../version-management/git-and-tools/transcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index d04f0d5792b2..35e9c17438f7 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz"; + sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; buildInputs = [ git makeWrapper openssl ]; From cd7bfa6f48295f361c691a7520fb122938bd2a68 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 30 May 2018 23:41:56 +0200 Subject: [PATCH 035/153] lispPackages: drop pgloader that leads to a circular depedency --- .../lisp-modules/quicklisp-to-nix-systems.txt | 2 +- .../lisp-modules/quicklisp-to-nix.nix | 329 +----------------- 2 files changed, 13 insertions(+), 318 deletions(-) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index babfba3f653d..3b10d610d272 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -100,7 +100,6 @@ nibbles optima parenscript pcall -pgloader plump proc-parse prove @@ -108,6 +107,7 @@ prove query-fs quri salza2 +simple-date smart-buffer split-sequence static-vectors diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 8d150cc29b3c..71d974d9711b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,21 +6,6 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql"; - - - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; - - - "moptilities" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."moptilities" or (x: {})) - (import ./quicklisp-to-nix-output/moptilities.nix { - inherit fetchurl; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - })); - - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; @@ -40,239 +25,6 @@ let quicklisp-to-nix-packages = rec { })); - "uuid" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."uuid" or (x: {})) - (import ./quicklisp-to-nix-output/uuid.nix { - inherit fetchurl; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; - })); - - - "simple-date" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."simple-date" or (x: {})) - (import ./quicklisp-to-nix-output/simple-date.nix { - inherit fetchurl; - "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "fiveam" = quicklisp-to-nix-packages."fiveam"; - "md5" = quicklisp-to-nix-packages."md5"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "s-sql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."s-sql" or (x: {})) - (import ./quicklisp-to-nix-output/s-sql.nix { - inherit fetchurl; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fiveam" = quicklisp-to-nix-packages."fiveam"; - "md5" = quicklisp-to-nix-packages."md5"; - "postmodern" = quicklisp-to-nix-packages."postmodern"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "qmynd" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."qmynd" or (x: {})) - (import ./quicklisp-to-nix-output/qmynd.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "list-of" = quicklisp-to-nix-packages."list-of"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "salza2" = quicklisp-to-nix-packages."salza2"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "py-configparser" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."py-configparser" or (x: {})) - (import ./quicklisp-to-nix-output/py-configparser.nix { - inherit fetchurl; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - })); - - - "postmodern" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."postmodern" or (x: {})) - (import ./quicklisp-to-nix-output/postmodern.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fiveam" = quicklisp-to-nix-packages."fiveam"; - "md5" = quicklisp-to-nix-packages."md5"; - "s-sql" = quicklisp-to-nix-packages."s-sql"; - "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests"; - "simple-date" = quicklisp-to-nix-packages."simple-date"; - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "mssql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."mssql" or (x: {})) - (import ./quicklisp-to-nix-output/mssql.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "garbage-pools" = quicklisp-to-nix-packages."garbage-pools"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - })); - - - "metatilities-base" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."metatilities-base" or (x: {})) - (import ./quicklisp-to-nix-output/metatilities-base.nix { - inherit fetchurl; - })); - - - "lparallel" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lparallel" or (x: {})) - (import ./quicklisp-to-nix-output/lparallel.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - })); - - - "list-of" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."list-of" or (x: {})) - (import ./quicklisp-to-nix-output/list-of.nix { - inherit fetchurl; - "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; - })); - - - "ixf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."ixf" or (x: {})) - (import ./quicklisp-to-nix-output/ixf.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "ieee-floats" = quicklisp-to-nix-packages."ieee-floats"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "md5" = quicklisp-to-nix-packages."md5"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - })); - - - "garbage-pools" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."garbage-pools" or (x: {})) - (import ./quicklisp-to-nix-output/garbage-pools.nix { - inherit fetchurl; - })); - - - "dynamic-classes" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."dynamic-classes" or (x: {})) - (import ./quicklisp-to-nix-output/dynamic-classes.nix { - inherit fetchurl; - "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; - })); - - - "db3" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."db3" or (x: {})) - (import ./quicklisp-to-nix-output/db3.nix { - inherit fetchurl; - })); - - - "cl-markdown" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-markdown" or (x: {})) - (import ./quicklisp-to-nix-output/cl-markdown.nix { - inherit fetchurl; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; - "cl-containers" = quicklisp-to-nix-packages."cl-containers"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes"; - "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; - "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; - })); - - - "cl-log" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-log" or (x: {})) - (import ./quicklisp-to-nix-output/cl-log.nix { - inherit fetchurl; - })); - - - "cl-containers" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-containers" or (x: {})) - (import ./quicklisp-to-nix-output/cl-containers.nix { - inherit fetchurl; - "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; - "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; - "moptilities" = quicklisp-to-nix-packages."moptilities"; - })); - - - "asdf-finalizers" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."asdf-finalizers" or (x: {})) - (import ./quicklisp-to-nix-output/asdf-finalizers.nix { - inherit fetchurl; - })); - - - "abnf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."abnf" or (x: {})) - (import ./quicklisp-to-nix-output/abnf.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "esrap" = quicklisp-to-nix-packages."esrap"; - })); - - "stefil" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."stefil" or (x: {})) @@ -1298,6 +1050,18 @@ let quicklisp-to-nix-packages = rec { })); + "simple-date" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-date" or (x: {})) + (import ./quicklisp-to-nix-output/simple-date.nix { + inherit fetchurl; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "md5" = quicklisp-to-nix-packages."md5"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "salza2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."salza2" or (x: {})) @@ -1381,75 +1145,6 @@ let quicklisp-to-nix-packages = rec { })); - "pgloader" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."pgloader" or (x: {})) - (import ./quicklisp-to-nix-output/pgloader.nix { - inherit fetchurl; - "abnf" = quicklisp-to-nix-packages."abnf"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers"; - "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl-containers" = quicklisp-to-nix-packages."cl-containers"; - "cl-csv" = quicklisp-to-nix-packages."cl-csv"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-log" = quicklisp-to-nix-packages."cl-log"; - "cl-markdown" = quicklisp-to-nix-packages."cl-markdown"; - "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments"; - "db3" = quicklisp-to-nix-packages."db3"; - "drakma" = quicklisp-to-nix-packages."drakma"; - "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes"; - "esrap" = quicklisp-to-nix-packages."esrap"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "garbage-pools" = quicklisp-to-nix-packages."garbage-pools"; - "ieee-floats" = quicklisp-to-nix-packages."ieee-floats"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "ixf" = quicklisp-to-nix-packages."ixf"; - "list-of" = quicklisp-to-nix-packages."list-of"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "lparallel" = quicklisp-to-nix-packages."lparallel"; - "md5" = quicklisp-to-nix-packages."md5"; - "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; - "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; - "mssql" = quicklisp-to-nix-packages."mssql"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - "postmodern" = quicklisp-to-nix-packages."postmodern"; - "puri" = quicklisp-to-nix-packages."puri"; - "py-configparser" = quicklisp-to-nix-packages."py-configparser"; - "qmynd" = quicklisp-to-nix-packages."qmynd"; - "quri" = quicklisp-to-nix-packages."quri"; - "s-sql" = quicklisp-to-nix-packages."s-sql"; - "salza2" = quicklisp-to-nix-packages."salza2"; - "simple-date" = quicklisp-to-nix-packages."simple-date"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "sqlite" = quicklisp-to-nix-packages."sqlite"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - "uuid" = quicklisp-to-nix-packages."uuid"; - })); - - "pcall" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pcall" or (x: {})) From 5c16e62d4bdea6e026ea1475878704e6642403c7 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 31 May 2018 00:39:12 +0300 Subject: [PATCH 036/153] git-lfs: 2.3.4 -> 2.4.2 (#41249) --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 5c2e99d8e3fe..6ca563f7d1a6 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.3.4"; + version = "2.4.2"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0fv1ly9577jrjwx91jqfql740rwp06chl4y37pcpl72nc08jvcw7"; + sha256 = "0ww1jh45nlm74vbi4n6cdxi35bzgjlqmz3q8h9igdwfhkf79kd5c"; }; preBuild = '' From 30c3a7f5c6d5ca9a250dcdfce6b536c4cc9e54c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 14:44:54 -0700 Subject: [PATCH 037/153] strongswan: 5.6.2 -> 5.6.3 (#41237) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/strongswan/versions. These checks were done: - built on NixOS - /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/pki passed the binary check. - /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-cmd passed the binary check. - Warning: no invocation of /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-systemd had a zero exit code or showed the expected version - /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/ipsec passed the binary check. - /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/swanctl passed the binary check. - 4 of 5 passed binary check by having a zero exit code. - 1 of 5 passed binary check by having the new version present in output. - found 5.6.3 with grep in /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3 - directory tree listing: https://gist.github.com/258736889db4e822d054b65e7035147b - du listing: https://gist.github.com/478dbb4f44b4ed18b112076b17451a4e --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index eb466745ef84..9ceb08ad72e9 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.6.2"; + version = "5.6.3"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "14ifqay54brw2b2hbmm517bxw8bs9631d7jm4g139igkxcq0m9p0"; + sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3"; }; dontPatchELF = true; From 4d2cd9894b8638bb8fd3052eab9eb3f7bae62105 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 14:57:09 -0700 Subject: [PATCH 038/153] libcouchbase: 2.8.7 -> 2.9.0 (#41113) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions. These checks were done: - built on NixOS - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-cat passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-create passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-observe passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-observe-seqno passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-incr passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-decr passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-mcflush passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-hash passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-lock passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-unlock passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-rm passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-stats passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-version passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-verbosity passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-view passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-n1ql passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-admin passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-ping passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-create passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-delete passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-flush passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-connstr passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-write-config passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-strerror passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-touch passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-role-list passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-list passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-upsert passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-delete passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-watch passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-pillowfight passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-n1qlback passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-subdoc passed the binary check. - /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-proxy passed the binary check. - 35 of 35 passed binary check by having a zero exit code. - 0 of 35 passed binary check by having the new version present in output. - found 2.9.0 with grep in /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0 - directory tree listing: https://gist.github.com/615a7ba10ca91c94d08d74c5a200cef6 - du listing: https://gist.github.com/9991135c2e307e906da31f66df3aa79c --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index d6447e449cfb..bf72ec767258 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1"; + sha256 = "12s2iw4akil3hlvsccns7qw2c90yw5h67zj3wq03q938w8xcw0d0"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From ea3769ec81a3a8e95ecd995d90165998a2d91938 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 15:14:46 -0700 Subject: [PATCH 039/153] povray: 3.7.0.7 -> 3.7.0.8 (#41269) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/povray/versions. These checks were done: - built on NixOS - /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8/bin/povray passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.7.0.8 with grep in /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8 - directory tree listing: https://gist.github.com/d35bed4b147aefbe2b8c6e42bdf56ccb - du listing: https://gist.github.com/75bee836a81741aa901a3677fb40aa16 --- pkgs/tools/graphics/povray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 5dfed3722e09..217a85f266ab 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.7"; + version = "3.7.0.8"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7"; + sha256 = "1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z"; }; From a3efa24da976a993848059fa9adf5e28fccb0d65 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 31 May 2018 02:50:27 +0400 Subject: [PATCH 040/153] chromium: bump dev version --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b0da1b5809c2..2113b9cdbed7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -7,8 +7,8 @@ }; dev = { sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc"; - sha256bin64 = "0y69ykzj1phpvmhd380wijzs0f8s15gmvb88zd4m8fzqi6gg51dj"; - version = "68.0.3438.3"; + sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw"; + version = "68.0.3440.7"; }; stable = { sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; From 21155d586fb3f15a53c3affb662633b3cf2978ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 16:18:24 -0700 Subject: [PATCH 041/153] khal: 0.9.8 -> 0.9.9 (#41267) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/khal/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/.ikhal-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/ikhal had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/.khal-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/khal had a zero exit code or showed the expected version - 0 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 0.9.9 with grep in /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9 - directory tree listing: https://gist.github.com/a146a88f248f45c280a17c50a0d46b79 - du listing: https://gist.github.com/72d0555178317dce9c07ab814f13f512 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 5351cd41b251..9dd466c442aa 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "khal"; - version = "0.9.8"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"; + sha256 = "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh"; }; LC_ALL = "en_US.UTF-8"; From 4fc23d2de09d3ae357088bcf35bb9915acd08e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 31 May 2018 00:35:20 +0100 Subject: [PATCH 042/153] hubUnstable: remove in favor of hub --- .../git-and-tools/default.nix | 4 +-- .../git-and-tools/hub/unstable.nix | 36 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/hub/unstable.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 99b6b5313709..9a4ef524dde9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -109,9 +109,7 @@ rec { inherit (darwin) Security; }; - hubUnstable = callPackage ./hub/unstable.nix { - inherit (darwin) Security; - }; + hubUnstable = throw "use gitAndTools.hub instead"; qgit = qt5.callPackage ./qgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix deleted file mode 100644 index 7e83c2cfb674..000000000000 --- a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: - -stdenv.mkDerivation rec { - name = "hub-${version}"; - version = "2.3.0-pre10"; - - src = fetchgit { - url = https://github.com/github/hub.git; - rev = "refs/tags/v${version}"; - sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd"; - }; - - buildInputs = [ go ronn groff utillinux ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - buildPhase = '' - mkdir bin - ln -s ${ronn}/bin/ronn bin/ronn - - patchShebangs . - make all man-pages - ''; - - installPhase = '' - prefix=$out sh -x < script/install.sh - ''; - - meta = with stdenv.lib; { - description = "Command-line wrapper for git that makes you better at GitHub"; - - license = licenses.mit; - homepage = https://hub.github.com/; - maintainers = with maintainers; [ the-kenny ]; - platforms = with platforms; unix; - }; -} From e055b76336e63cf7db6201356c1fbe558c621524 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 30 May 2018 19:52:17 -0400 Subject: [PATCH 043/153] linux: 4.4.134 -> 4.4.135 --- 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 1f9b52c8db74..e06be4838ee3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.134"; + version = "4.4.135"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20"; + sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03"; }; } // (args.argsOverride or {})) From 943d2fce81c4017bb2eb0d5e0dd48b6f15f35b77 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 30 May 2018 19:52:43 -0400 Subject: [PATCH 044/153] linux: 4.9.104 -> 4.9.105 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8d4094075a49..d69717b15fe7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.104"; + version = "4.9.105"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv"; + sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh"; }; } // (args.argsOverride or {})) From 4afe59cb360da4a8134b6599e0f54fa7351949e0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 30 May 2018 19:53:01 -0400 Subject: [PATCH 045/153] linux: 4.14.46 -> 4.14.47 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a7277d679684..d7bcd411764b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.46"; + version = "4.14.47"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h"; + sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7"; }; } // (args.argsOverride or {})) From 98463f7a6c8a1b7165aea9a5074362709e7b06f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 17:50:58 -0700 Subject: [PATCH 046/153] iperf2: 2.0.10 -> 2.0.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iperf/versions. These checks were done: - built on NixOS - /nix/store/96cfq6l9jpw5jb2xfmyqsqvpx9khvaff-iperf-2.0.11/bin/iperf passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.0.11 with grep in /nix/store/96cfq6l9jpw5jb2xfmyqsqvpx9khvaff-iperf-2.0.11 - directory tree listing: https://gist.github.com/9e979b025f65af2cc7e8ffe313002b2f - du listing: https://gist.github.com/68cf597a93df8e798cb97551f8303fa4 --- pkgs/tools/networking/iperf/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 94be3c25d1fc..33e9841eb058 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.10"; + name = "iperf-2.0.11"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z"; + sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp"; }; hardeningDisable = [ "format" ]; From 9b0370fc47e9d79cef4d2aa4df3b14ea121543ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 18:37:42 -0700 Subject: [PATCH 047/153] folly: 2018.05.21.00 -> 2018.05.28.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2018.05.28.00 with grep in /nix/store/j0vmqnzcn83749cw2x6rzzf3bay2zyg0-folly-2018.05.28.00 - directory tree listing: https://gist.github.com/2a05d2503ea41d5bd03239e4562bea92 - du listing: https://gist.github.com/f4cb65851fac8a956d81301fa5623140 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 36da31e8908a..8abd42fe1744 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.05.21.00"; + version = "2018.05.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0x8qa0g0rj4bmy5cra7f0ch0srq34d8d04f1c59q93xd6ggkr52w"; + sha256 = "1n5zic8bgm4dfc7prjj3af2ipxalia6w7dk6w9pmrz1nkrpyd68c"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From f24f6d7af33d2ccc2942fba735e8de81c2ea268d Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Wed, 30 May 2018 18:48:42 -0700 Subject: [PATCH 048/153] tests.cc-wrapper: skip known-broken sanitizer cases --- pkgs/test/cc-wrapper/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 87d070f56162..00b964940c81 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,6 +1,9 @@ { stdenv }: - -stdenv.mkDerivation { +with stdenv.lib; +let + # Sanitizer headers aren't available in older libc++ stdenvs due to a bug + sanitizersBroken = stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0; +in stdenv.mkDerivation { name = "cc-wrapper-test"; buildCommand = '' @@ -15,7 +18,7 @@ stdenv.mkDerivation { $CXX -o cxx-check ${./cxx-main.cc} ./cxx-check - ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + ${optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' printf "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} @@ -31,7 +34,7 @@ stdenv.mkDerivation { printf "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib $CC -shared \ - ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + ${optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} @@ -39,11 +42,14 @@ stdenv.mkDerivation { NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check - $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} - ./sanitizers + ${optionalString (!sanitizersBroken) '' + printf "checking whether sanitizers are fully functional... ">&2 + $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ./sanitizers + ''} touch $out ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = platforms.all; } From b8110dbee652cd41c0868a6d8e19e86557d50046 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 20:11:53 -0700 Subject: [PATCH 049/153] git-hub: 1.0.0 -> 1.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-hub/versions. These checks were done: - built on NixOS - /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1/bin/git-hub passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.0.1 with grep in /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1 - directory tree listing: https://gist.github.com/fc09f98152d4008f23cb52855621b6bb - du listing: https://gist.github.com/29489408ac7b6cb1137948d9edd0fef6 --- .../version-management/git-and-tools/git-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index b4c3baecd417..94143e652f95 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { - sha256 = "07756pidrm4cph3nm90z16imvnylvz3fw4369wrglbdr27filf3x"; + sha256 = "1lizjyi8vac1p1anbnh6qrr176rwxp5yjc1787asw437sackkwza"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; From 3414e67a9de794948a595e94f31bc29eac3f95e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 20:21:01 -0700 Subject: [PATCH 050/153] flyway: 5.0.7 -> 5.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flyway/versions. These checks were done: - built on NixOS - /nix/store/g01xk8pg48hnpaazi1kl0rhc2qzln0ds-flyway-5.1.1/bin/flyway passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 5.1.1 with grep in /nix/store/g01xk8pg48hnpaazi1kl0rhc2qzln0ds-flyway-5.1.1 - directory tree listing: https://gist.github.com/4d37780b7850ab73ad0c8dadf82a0a5b - du listing: https://gist.github.com/40c8567fb139fa68811ad82c15399369 --- pkgs/development/tools/flyway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 43026e55e7f3..924dde91acc5 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.0.7"; + version = "5.1.1"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz"; - sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-${version}.tar.gz"; + sha256 = "0kdi7m5rwlik0d2rn9s3siqmc83xfkhhsdxw3g7r1mvk2ivscb7f"; }; buildInputs = [ makeWrapper ]; dontBuild = true; From f855beb988b44c11098667b07ebcb30f60cafd74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 23:46:06 -0700 Subject: [PATCH 051/153] opentsdb: 2.3.0 -> 2.3.1 (#41273) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opentsdb/versions. These checks were done: - built on NixOS - /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1/bin/tsdb passed the binary check. - Warning: no invocation of /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1/bin/.tsdb-wrapped had a zero exit code or showed the expected version - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.3.1 with grep in /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1 - directory tree listing: https://gist.github.com/b48d02ce7d61ccc9a1066feef216ebeb - du listing: https://gist.github.com/fa09ba05d6c0f628805a900c2624ac13 --- pkgs/tools/misc/opentsdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 31375eeaf85d..f6aea4a92ab9 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "opentsdb-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0nip40rh3vl5azfc27yha4ngnm9sw47hf110c90hg0warzz85sch"; + sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; From 51fbd3068b94a205feefc471c0cb262a05bd4c55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 30 May 2018 23:54:06 -0700 Subject: [PATCH 052/153] pacman: 5.0.2 -> 5.1.0 (#41275) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pacman/versions. These checks were done: - built on NixOS - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-add passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/makepkg passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-db-upgrade passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-key passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pkgdelta passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-elephant passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-remove passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/vercmp passed the binary check. - Warning: no invocation of /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/testpkg had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/cleanupdelta had a zero exit code or showed the expected version - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-conf passed the binary check. - /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/makepkg-template passed the binary check. - 11 of 13 passed binary check by having a zero exit code. - 0 of 13 passed binary check by having the new version present in output. - found 5.1.0 with grep in /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0 - directory tree listing: https://gist.github.com/61f365ecd9146adf48fc68403568904d - du listing: https://gist.github.com/391d88c911aeda73c0cd89f80ced8ce2 --- pkgs/tools/package-management/pacman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index cdee8c15d8b5..d343064cc539 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "pacman-${version}"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz"; - sha256 = "1lk54k7d281v55fryqsajl4xav7rhpk8x8pxcms2v6dapp959hgi"; + sha256 = "1b545zvh661vkypnqr1cdicypym9d2kfvnxbf4a61qkyza6kzx35"; }; # trying to build docs fails with a2x errors, unable to fix through asciidoc From 78ae380773a0445ee985a9c3ca61e157c1d50b09 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Thu, 31 May 2018 09:04:17 +0200 Subject: [PATCH 053/153] openshift: fix mkdir command (#41274) --- pkgs/applications/networking/cluster/openshift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 79eb8bb233c9..6b6a2dc8986b 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' From 630f3337d4180e65f0f7933ab01a65861a0f33f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 May 2018 00:11:40 -0700 Subject: [PATCH 054/153] galen: 2.3.6 -> 2.3.7 (#41296) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/galen/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7/bin/galen.jar had a zero exit code or showed the expected version - /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7/bin/galen passed the binary check. - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.3.7 with grep in /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7 - directory tree listing: https://gist.github.com/c69a7c8c8a31e5b3b0d3243ea03c777f - du listing: https://gist.github.com/a6d7632f5a3c34d8c20c3f24715aa6a3 --- pkgs/development/tools/galen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index bbcdc0cd798e..2bb67d6f761b 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.3.6"; + version = "2.3.7"; name = "${pname}-${version}"; inherit jre8; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "0kndib3slj7mdvhd36fxin5q87cnsz4hs135yxgjx0nccxq4f2h5"; + sha256 = "045y1s4n8jd52jnk9kwd0k4x3yscvcfsf2rxzn0xngvn9nkw2g65"; }; buildInputs = [ unzip ]; From ecb257831655b8316ba60b2f3b37b97288edc469 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 31 May 2018 09:33:42 +0200 Subject: [PATCH 055/153] groovy: 2.4.15 -> 2.5.0 (#41270) --- pkgs/development/interpreters/groovy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 968d9f1e8fb0..d2d923d783d7 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.15"; + version = "2.5.0"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1vaa1wjnaza04hvp1n4kh10hvxx8370liz2ndm908dqv9mxa6k5x"; + sha256 = "1qzciri8qjx5p7x015rk5ws7gj53qidamp85r2r7aj6ssyp3r40k"; }; buildInputs = [ unzip makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out mkdir -p $out/share/doc/groovy rm bin/*.bat - mv {bin,conf,embeddable,grooid,indy,lib} $out + mv {bin,conf,grooid,indy,lib} $out mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy From e37e19ff6182258a3b9f0ab68604797efd66deff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 May 2018 01:13:32 -0700 Subject: [PATCH 056/153] yoshimi: 1.5.7 -> 1.5.8 (#41221) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yoshimi/versions. These checks were done: - built on NixOS - /nix/store/jpvzkcfk0dablksr19lnwi7xajm7d7bh-yoshimi-1.5.8/bin/yoshimi passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.5.8 with grep in /nix/store/jpvzkcfk0dablksr19lnwi7xajm7d7bh-yoshimi-1.5.8 - directory tree listing: https://gist.github.com/53f8899fb2961c61707a03b4bcb225d1 - du listing: https://gist.github.com/3b61f944f2b81b3f5bc299051a284cec --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 678345a91ddd..0c85d72cc901 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1w916mmi6hh547a7icrgx6qr2kwxlxwlm6ampql427rshcz9r61k"; + sha256 = "0gwsr5srzy28hwqhfzrc8pswysmyra8kbww3bxfx8bq4mdjifdj6"; }; buildInputs = [ From 47b85dc5ab8243a653c20d4851a3e6c966877251 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 May 2018 11:31:04 +0200 Subject: [PATCH 057/153] nix: 2.0.3 -> 2.0.4 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++---- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index a7d41d4a8436..7c5414257b46 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/8d9zsq17v8f7lgbc5ca6gv438gk1ydqm-nix-2.0.3"; - i686-linux = "/nix/store/7k7ca4ck24yqinbr9nyl5z2wmcx4l81g-nix-2.0.3"; - aarch64-linux = "/nix/store/ckmrh426n1swlq9h4d53hvrxjc72avzp-nix-2.0.3"; - x86_64-darwin = "/nix/store/2jp9d9qns3372hkx4k523hc1bbzkr4yp-nix-2.0.3"; + x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4"; + i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4"; + aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4"; + x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 076451de31e2..c3f1e4d8d459 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -133,10 +133,10 @@ in rec { }) // { perl-bindings = nixStable; }; nixStable = (common rec { - name = "nix-2.0.3"; + name = "nix-2.0.4"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "4f2f1d624cecac3baf7a026f89e08cf3d01bd6983cc7812bca4178092e436660"; + sha256 = "166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; From 828ddc2e20e6644b054d9c7efc0d1c3f5c221a87 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Thu, 31 May 2018 11:42:12 +0200 Subject: [PATCH 058/153] perlPackages.DBDPg: disable tests Build was broken because tests freeze in sandbox, disable them. Fixes #41199. --- pkgs/development/perl-modules/DBD-Pg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 3cf6880050b4..b9d287b2bf3c 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -13,6 +13,9 @@ buildPerlPackage rec { makeMakerFlags = "POSTGRES_HOME=${postgresql}"; + # tests freeze in a sandbox + doCheck = false; + meta = { homepage = http://search.cpan.org/dist/DBD-Pg/; description = "DBI PostgreSQL interface"; From feaf65f1eecf1e7ad248e5d3240be52736a8af8c Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 31 May 2018 12:33:39 +0200 Subject: [PATCH 059/153] darcs: Allow newer graphviz Fixes #41306 --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a63462028795..a88cd1c789ed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -939,7 +939,8 @@ self: super: { haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; }; # Jailbreak "unix-compat >=0.1.2 && <0.5". - darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' darcs.cabal"; }); + # Jailbreak "graphviz >=2999.18.1 && <2999.20". + darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; }); # https://github.com/Twinside/Juicy.Pixels/issues/149 JuicyPixels = dontHaddock super.JuicyPixels; From c4900b2fceed98dab4ce1d72e1f9d0826e42d7e2 Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Thu, 31 May 2018 12:22:52 +0100 Subject: [PATCH 060/153] pythonPackage.amazon_kclpy: init at 1.5.0 --- .../python-modules/amazon_kclpy/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/amazon_kclpy/default.nix diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix new file mode 100644 index 000000000000..f0ee7dd241be --- /dev/null +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }: + +buildPythonPackage rec { + pname = "amazon_kclpy"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "amazon-kinesis-client-python"; + rev = "v${version}"; + sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m"; + }; + + # argparse is just required for python2.6 + prePatch = '' + substituteInPlace setup.py \ + --replace "'argparse'," "" + ''; + + propagatedBuildInputs = [ mock boto ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + ${python.interpreter} -m pytest + ''; + + meta = with stdenv.lib; { + description = "Amazon Kinesis Client Library for Python"; + homepage = https://github.com/awslabs/amazon-kinesis-client-python; + license = licenses.asl; + maintainers = with maintainers; [ psyanticy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a230853087c..031746346b9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -201,6 +201,8 @@ in { # packages defined elsewhere + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; bap = callPackage ../development/python-modules/bap { From fdec3e7dce4213c812ea1985965df4d9303dfcf0 Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Thu, 31 May 2018 12:57:50 +0100 Subject: [PATCH 061/153] pythonPackage.amazon_kclpy: fix licence name asl -> amazonsl --- pkgs/development/python-modules/amazon_kclpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index f0ee7dd241be..a405b575b253 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Amazon Kinesis Client Library for Python"; homepage = https://github.com/awslabs/amazon-kinesis-client-python; - license = licenses.asl; + license = licenses.amazonsl; maintainers = with maintainers; [ psyanticy ]; }; } From 56023ac0ba5d24708a3210db7ba087ebd86e3d6c Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 31 May 2018 14:14:25 +0200 Subject: [PATCH 062/153] cargo-edit: Fixes build with carnix (#39348) --- .../cargo-edit/cargo-edit.nix | 1910 +++++++++++++++++ .../package-management/cargo-edit/default.nix | 43 +- 2 files changed, 1931 insertions(+), 22 deletions(-) create mode 100644 pkgs/tools/package-management/cargo-edit/cargo-edit.nix diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix new file mode 100644 index 000000000000..c37ef373ac24 --- /dev/null +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -0,0 +1,1910 @@ +# Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone +with import {}; +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); +in +rec { + cargo_edit = f: cargo_edit_0_2_0 { features = cargo_edit_0_2_0_features { cargo_edit_0_2_0 = f; }; }; + adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.0"; + authors = [ "Remi Rampin " ]; + sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; + inherit dependencies buildDependencies features; + }; + advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "advapi32-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; + libName = "advapi32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + assert_cli_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "assert_cli"; + version = "0.4.0"; + authors = [ "Pascal Hertleif " ]; + sha256 = "0jq138q0wma5b149ixjv43al19xnzwgp67s908mh4cma1ar4rxbn"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.2"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "0cj0ynv5p2f5ghisw58yjwrw4gvpji6sh12kk9j0228j7bhjznv7"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.11"; + authors = [ "Alex Crichton " ]; + sha256 = "06c6s9hsygix25awgcfa1gnzvihc7kvv5apnmf6p15l4phwzz6x6"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + base64_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "base64"; + version = "0.6.0"; + authors = [ "Alice Maz " "Marshall Pierce " ]; + sha256 = "0ql1rmczbnww3iszc0pfc6mqa47ravpsdf525vp6s8r32nyzspl5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + inherit dependencies buildDependencies features; + }; + bytes_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bytes"; + version = "0.4.4"; + authors = [ "Carl Lerche " ]; + sha256 = "028l4zlrjbr62y92slr84zil8h1bypqr7g545i566gf7cbss7hsp"; + inherit dependencies buildDependencies features; + }; + cargo_edit_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo-edit"; + version = "0.2.0"; + authors = [ "Without Boats " "Pascal Hertleif " "Sebastian Garrido " "Jonas Platte " "Benjamin Gill " "Andronik Ordian " ]; + src = ./.; + crateBin = [ { name = "cargo-add"; path = "src/bin/add/main.rs"; } { name = "cargo-rm"; path = "src/bin/rm/main.rs"; } { name = "cargo-upgrade"; path = "src/bin/upgrade/main.rs"; } ]; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + colored_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "colored"; + version = "1.5.2"; + authors = [ "Thomas Wickham " ]; + sha256 = "0d7c6vpqzlabph7qr29hdjgsks8z9hqcarzl8z5dfb8cnnrfrhzn"; + inherit dependencies buildDependencies features; + }; + core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm"; + inherit dependencies buildDependencies features; + }; + core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.2.3"; + authors = [ "The Servo Project Developers" ]; + sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + crypt32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crypt32-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "1vy1q3ayc7f4wiwyxw31hd12cvs7791x3by6ka9wbxhm5gzfs3d0"; + libName = "crypt32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbghelp-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; + libName = "dbghelp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + difference_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "difference"; + version = "1.0.0"; + authors = [ "Johann Hofmann " ]; + sha256 = "0r1p2diin8zykfiifv6v9i3ajimdb1rg6qzxkrfw2n2iy57846qn"; + crateBin = [ { name = "difference"; } ]; + inherit dependencies buildDependencies features; + }; + docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "docopt"; + version = "0.8.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss"; + crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; + }; + error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.10.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z"; + inherit dependencies buildDependencies features; + }; + foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types"; + version = "0.2.0"; + authors = [ "Steven Fackler " ]; + sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh"; + inherit dependencies buildDependencies features; + }; + futures_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.14"; + authors = [ "Alex Crichton " ]; + sha256 = "1s53l50dy9abbycc88ghz1s76yfacygrxr3vnkl132m9ja0qi9nl"; + inherit dependencies buildDependencies features; + }; + futures_cpupool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures-cpupool"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "1i001y0qv8pvvqd2ch1gsxw97286bcf789mlnhaindjzhm7x8fi6"; + inherit dependencies buildDependencies features; + }; + gcc_0_3_51_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.51"; + authors = [ "Alex Crichton " ]; + sha256 = "0h2lnfakbvyn7lzpi5x41y30d5pzwz3172bdjzxxm4j59ipby563"; + inherit dependencies buildDependencies features; + }; + getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "getopts"; + version = "0.2.14"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a"; + inherit dependencies buildDependencies features; + }; + httparse_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "httparse"; + version = "1.2.3"; + authors = [ "Sean McArthur " ]; + sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93"; + inherit dependencies buildDependencies features; + }; + hyper_0_11_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper"; + version = "0.11.1"; + authors = [ "Sean McArthur " ]; + sha256 = "0al73rns6d18f09v872hasr5sf56mpzg4cpzi9g0118fy6v2z21a"; + inherit dependencies buildDependencies features; + }; + hyper_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hyper-tls"; + version = "0.1.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0n39sb8sc2pzdg501nshmv35q0r9pnrfjh8r1pdlygwxgcni9n3d"; + inherit dependencies buildDependencies features; + }; + idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "idna"; + version = "0.1.4"; + authors = [ "The rust-url developers" ]; + sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; + inherit dependencies buildDependencies features; + }; + iovec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "iovec"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "01gmbcaamfms70ll964wj3akqbj5bf6zzi7nfj5y2hvzjxd959sj"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "language-tags"; + version = "0.2.2"; + authors = [ "Pyfisch " ]; + sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; + }; + lazycell_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazycell"; + version = "0.4.0"; + authors = [ "Alex Crichton " "Nikita Pekin " ]; + sha256 = "1vgxv62l8qh3m8gvjyrd7wkx44hih724ivssc1mwj7vq9gnhgl0d"; + inherit dependencies buildDependencies features; + }; + libc_0_2_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.26"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0938y1yh2sr08zy8vpgj9wqk3nildip4ngpy2krvarzc8aqgvxrc"; + inherit dependencies buildDependencies features; + }; + libflate_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libflate"; + version = "0.1.10"; + authors = [ "Takeru Ohta " ]; + sha256 = "123m6wz1qvczv8fnak0k71hb7gj2kkiw3sj3rv55gfmir2kgf6gk"; + inherit dependencies buildDependencies features; + }; + log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + inherit dependencies buildDependencies features; + }; + matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "matches"; + version = "0.1.6"; + authors = [ "Simon Sapin " ]; + sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.1"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "071m5y0zm9p1k7pzqm20f44ixvmycf71xsrpayqaypxrjwchnkxm"; + inherit dependencies buildDependencies features; + }; + mime_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mime"; + version = "0.3.2"; + authors = [ "Sean McArthur " ]; + sha256 = "10yv7sq2gbq8xdh4imrga3wqiar652y8y31f8jqxw313pwsks3m5"; + inherit dependencies buildDependencies features; + }; + mio_0_6_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "mio"; + version = "0.6.9"; + authors = [ "Carl Lerche " ]; + sha256 = "0fbx9mxqqzcp0jzm1xkg9h4l4l43vphv3zca4zpdc8ahadvfw6qh"; + inherit dependencies buildDependencies features; + }; + miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + inherit dependencies buildDependencies features; + }; + native_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "native-tls"; + version = "0.1.4"; + authors = [ "Steven Fackler " ]; + sha256 = "0q5y5i96mfpjbhx8y7w9rdq65mksw67m60bw4xqlybc8y6jkr99v"; + inherit dependencies buildDependencies features; + }; + net2_0_2_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "net2"; + version = "0.2.30"; + authors = [ "Alex Crichton " ]; + sha256 = "1gd7r0d646sa3fdj7rwyyx43fj7m9amqvmn0h4gv6sqcwgb7rlad"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.6.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm"; + inherit dependencies buildDependencies features; + }; + openssl_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl"; + version = "0.9.14"; + authors = [ "Steven Fackler " ]; + sha256 = "0z8bza11x7fbhzsa3xrp4hzv4sl83102yxaiigmsdh2a480xg6jl"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + openssl_sys_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.14"; + authors = [ "Alex Crichton " "Steven Fackler " ]; + sha256 = "0wq8hanw6lsm7h49ql62b3z5immbk8dcbp61vddd0pi5rk53cb2w"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + pad_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pad"; + version = "0.1.4"; + authors = [ "Ben S " ]; + sha256 = "1ca30d5s6yx1cb5qa3hwxgl53m69cnn037disw3kr6cv7sy7mw1n"; + inherit dependencies buildDependencies features; + }; + percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.0"; + authors = [ "The rust-url developers" ]; + sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + pretty_assertions_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pretty_assertions"; + version = "0.2.1"; + authors = [ "Colin Kiegel " ]; + sha256 = "06i0q8xjs1kbv3g0amx997axm93znwvpmj560vxrzn7s55hb9a8i"; + inherit dependencies buildDependencies features; + }; + pulldown_cmark_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pulldown-cmark"; + version = "0.0.3"; + authors = [ "Raph Levien " ]; + sha256 = "08wgdjqjnaz8yjvamdwcf1cqz18z795frkmbal9rgp9g2i1yrzwy"; + inherit dependencies buildDependencies features; + }; + quick_error_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.0"; + authors = [ "Paul Colomiets " "Colin Kiegel " ]; + sha256 = "1gc95wll0algrl2cqrym6x97sg07hslczn6wkbnkxfikrfissmga"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.26"; + authors = [ "Jeremy Soller " ]; + sha256 = "0hfnc05jwlkkkjpvzzfbx8anzgc2n81n92pmvb065hkqlarbjz85"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + inherit dependencies buildDependencies features; + }; + reqwest_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "reqwest"; + version = "0.7.1"; + authors = [ "Sean McArthur " ]; + sha256 = "0w3x0f6wmha09jcv83dkw00gpl11afi2k4gsavl43ccfdfa4b2nh"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.4"; + authors = [ "Alex Crichton " ]; + sha256 = "0q7myf1m5r7cilayw5r2n5qraxwlcpdr7s2mq8c63pxrz48h24qv"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "safemem"; + version = "0.2.0"; + authors = [ "Austin Bonander " ]; + sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm"; + inherit dependencies buildDependencies features; + }; + schannel_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "schannel"; + version = "0.1.7"; + authors = [ "Steven Fackler " "Steffen Butzer " ]; + sha256 = "1np6wzxwj8r4kqmmz0a3w9dfs2zfwh0m7mrv7xpzxkpm4c4hcn5f"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped-tls"; + version = "0.1.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5"; + inherit dependencies buildDependencies features; + }; + secur32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "secur32-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0sp46ix9mx1156bidpfiq30xxsgmpva5jffls3259kxjqlxifcnx"; + libName = "secur32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + security_framework_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework"; + version = "0.1.14"; + authors = [ "Steven Fackler " ]; + sha256 = "0xxxasrqls0ssflxjl2bf6bvljig0piy13pscbgkxd4zqw7w8i7q"; + inherit dependencies buildDependencies features; + }; + security_framework_sys_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "security-framework-sys"; + version = "0.1.14"; + authors = [ "Steven Fackler " ]; + sha256 = "15ggkd39aq01yzrg0fxchciz9gf5wncl7k3mgvqmi7vk7hfhkcw7"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.7.0"; + authors = [ "Steve Klabnik " "The Rust Project Developers" ]; + sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8"; + inherit dependencies buildDependencies features; + }; + semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + authors = [ "Steve Klabnik " ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + inherit dependencies buildDependencies features; + }; + serde_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.10"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1p71hm8xpa7gfmhr2hzb4ah1ajhsmf3gh3i1fknf9ch8dn0qfycv"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.10"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1m5if144vqsjx9fk6g7b9x0cy8mam6w78yghv3fykngminklcjw6"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_15_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.15.1"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0s2i03rv2sppywan0z5qiif65b2wqc6lp5r5l71mz4nigrh04zrj"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.2"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0vabw2zciy8vy0hgj0khm1vwbvng4whwry7ylfl3ypd0inx84mn6"; + inherit dependencies buildDependencies features; + }; + serde_urlencoded_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_urlencoded"; + version = "0.5.1"; + authors = [ "Anthony Ramine " ]; + sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl"; + inherit dependencies buildDependencies features; + }; + skeptic_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "skeptic"; + version = "0.5.0"; + authors = [ "Brian Anderson " ]; + sha256 = "06vf19309psngmx61sg33czbkx1cg9bmw0wr66n9mqdhvwa4y52d"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "slab"; + version = "0.3.0"; + authors = [ "Carl Lerche " ]; + sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k"; + inherit dependencies buildDependencies features; + }; + smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "smallvec"; + version = "0.2.1"; + authors = [ "Simon Sapin " ]; + sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "take"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.38"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + inherit dependencies buildDependencies features; + }; + tokio_core_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-core"; + version = "0.1.8"; + authors = [ "Alex Crichton " ]; + sha256 = "1wikhmk648j13dxy4dpi435dm943ph5bf4ldfhpxn23cbzlr2kcp"; + inherit dependencies buildDependencies features; + }; + tokio_io_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-io"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "07ab05gmzq0xmi5h26wpvjzircax5bwfjgc3zzn62ll4rarz4pva"; + inherit dependencies buildDependencies features; + }; + tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-proto"; + version = "0.1.1"; + authors = [ "Carl Lerche " ]; + sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66"; + inherit dependencies buildDependencies features; + }; + tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-service"; + version = "0.1.0"; + authors = [ "Carl Lerche " ]; + sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih"; + inherit dependencies buildDependencies features; + }; + tokio_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tokio-tls"; + version = "0.1.3"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "0ib58y81qr64m3gg0pn7k06b71r8b05cmvakzpgfqdsw0qj08sva"; + inherit dependencies buildDependencies features; + }; + toml_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.2"; + authors = [ "Alex Crichton " ]; + sha256 = "12v5l461czglhspc0crn29brb9p67xx7n6karrrs87slvq4xc7f1"; + inherit dependencies buildDependencies features; + }; + unicase_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicase"; + version = "2.0.0"; + authors = [ "Sean McArthur " ]; + sha256 = "1nmidnfn5cwp6dr6aln2ffk8yvdfsf3si3bq1znss5swi3i5v64w"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + inherit dependencies buildDependencies features; + }; + unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + url_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "url"; + version = "1.5.1"; + authors = [ "The rust-url developers" ]; + sha256 = "1l2m7jdl2x09fdz60mjk63f61m3fjk1w5ykiadi9lxayg3bvppcw"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; + adler32_1_0_0_features = f: updateFeatures f (rec { + adler32_1_0_0.default = (f.adler32_1_0_0.default or true); + }) []; + advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + advapi32_sys_0_2_0_features = f: updateFeatures f (rec { + advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ { + dependencies = mapFeatures features ([ memchr_1_0_1 ]); + }; + aho_corasick_0_6_3_features = f: updateFeatures f (rec { + aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true); + memchr_1_0_1.default = true; + }) [ memchr_1_0_1_features ]; + assert_cli_0_4_0 = { features?(assert_cli_0_4_0_features {}) }: assert_cli_0_4_0_ { + dependencies = mapFeatures features ([ colored_1_5_2 difference_1_0_0 error_chain_0_10_0 ]); + buildDependencies = mapFeatures features ([ skeptic_0_5_0 ]); + }; + assert_cli_0_4_0_features = f: updateFeatures f (rec { + assert_cli_0_4_0.default = (f.assert_cli_0_4_0.default or true); + colored_1_5_2.default = true; + difference_1_0_0.default = true; + error_chain_0_10_0.default = true; + skeptic_0_5_0.default = true; + }) [ colored_1_5_2_features difference_1_0_0_features error_chain_0_10_0_features skeptic_0_5_0_features ]; + backtrace_0_3_2 = { features?(backtrace_0_3_2_features {}) }: backtrace_0_3_2_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 libc_0_2_26 rustc_demangle_0_1_4 ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_2.backtrace-sys or false then [ backtrace_sys_0_1_11 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_2.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else []) + ++ (if features.backtrace_0_3_2.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else []) + ++ (if features.backtrace_0_3_2.winapi or false then [ winapi_0_2_8 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_2 or {}); + }; + backtrace_0_3_2_features = f: updateFeatures f (rec { + backtrace_0_3_2.backtrace-sys = + (f.backtrace_0_3_2.backtrace-sys or false) || + (f.backtrace_0_3_2.libbacktrace or false) || + (backtrace_0_3_2.libbacktrace or false); + backtrace_0_3_2.coresymbolication = + (f.backtrace_0_3_2.coresymbolication or false) || + (f.backtrace_0_3_2.default or false) || + (backtrace_0_3_2.default or false); + backtrace_0_3_2.dbghelp = + (f.backtrace_0_3_2.dbghelp or false) || + (f.backtrace_0_3_2.default or false) || + (backtrace_0_3_2.default or false); + backtrace_0_3_2.dbghelp-sys = + (f.backtrace_0_3_2.dbghelp-sys or false) || + (f.backtrace_0_3_2.dbghelp or false) || + (backtrace_0_3_2.dbghelp or false); + backtrace_0_3_2.default = (f.backtrace_0_3_2.default or true); + backtrace_0_3_2.dladdr = + (f.backtrace_0_3_2.dladdr or false) || + (f.backtrace_0_3_2.default or false) || + (backtrace_0_3_2.default or false); + backtrace_0_3_2.kernel32-sys = + (f.backtrace_0_3_2.kernel32-sys or false) || + (f.backtrace_0_3_2.dbghelp or false) || + (backtrace_0_3_2.dbghelp or false); + backtrace_0_3_2.libbacktrace = + (f.backtrace_0_3_2.libbacktrace or false) || + (f.backtrace_0_3_2.default or false) || + (backtrace_0_3_2.default or false); + backtrace_0_3_2.libunwind = + (f.backtrace_0_3_2.libunwind or false) || + (f.backtrace_0_3_2.default or false) || + (backtrace_0_3_2.default or false); + backtrace_0_3_2.rustc-serialize = + (f.backtrace_0_3_2.rustc-serialize or false) || + (f.backtrace_0_3_2.serialize-rustc or false) || + (backtrace_0_3_2.serialize-rustc or false); + backtrace_0_3_2.serde = + (f.backtrace_0_3_2.serde or false) || + (f.backtrace_0_3_2.serialize-serde or false) || + (backtrace_0_3_2.serialize-serde or false); + backtrace_0_3_2.serde_derive = + (f.backtrace_0_3_2.serde_derive or false) || + (f.backtrace_0_3_2.serialize-serde or false) || + (backtrace_0_3_2.serialize-serde or false); + backtrace_0_3_2.winapi = + (f.backtrace_0_3_2.winapi or false) || + (f.backtrace_0_3_2.dbghelp or false) || + (backtrace_0_3_2.dbghelp or false); + backtrace_sys_0_1_11.default = true; + cfg_if_0_1_2.default = true; + dbghelp_sys_0_2_0.default = true; + kernel32_sys_0_2_2.default = true; + libc_0_2_26.default = true; + rustc_demangle_0_1_4.default = true; + winapi_0_2_8.default = true; + }) [ cfg_if_0_1_2_features libc_0_2_26_features rustc_demangle_0_1_4_features backtrace_sys_0_1_11_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + backtrace_sys_0_1_11 = { features?(backtrace_sys_0_1_11_features {}) }: backtrace_sys_0_1_11_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + buildDependencies = mapFeatures features ([ gcc_0_3_51 ]); + }; + backtrace_sys_0_1_11_features = f: updateFeatures f (rec { + backtrace_sys_0_1_11.default = (f.backtrace_sys_0_1_11.default or true); + gcc_0_3_51.default = true; + libc_0_2_26.default = true; + }) [ libc_0_2_26_features gcc_0_3_51_features ]; + base64_0_6_0 = { features?(base64_0_6_0_features {}) }: base64_0_6_0_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 safemem_0_2_0 ]); + }; + base64_0_6_0_features = f: updateFeatures f (rec { + base64_0_6_0.default = (f.base64_0_6_0.default or true); + byteorder_1_1_0.default = true; + safemem_0_2_0.default = true; + }) [ byteorder_1_1_0_features safemem_0_2_0_features ]; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { + features = mkFeatures (features.byteorder_1_1_0 or {}); + }; + byteorder_1_1_0_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); + byteorder_1_1_0.std = + (f.byteorder_1_1_0.std or false) || + (f.byteorder_1_1_0.default or false) || + (byteorder_1_1_0.default or false); + }) []; + bytes_0_4_4 = { features?(bytes_0_4_4_features {}) }: bytes_0_4_4_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 iovec_0_1_0 ]); + }; + bytes_0_4_4_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = true; + bytes_0_4_4.default = (f.bytes_0_4_4.default or true); + iovec_0_1_0.default = true; + }) [ byteorder_1_1_0_features iovec_0_1_0_features ]; + cargo_edit_0_2_0 = { features?(cargo_edit_0_2_0_features {}) }: cargo_edit_0_2_0_ { + dependencies = mapFeatures features ([ docopt_0_8_1 pad_0_1_4 quick_error_1_2_0 regex_0_2_2 reqwest_0_7_1 semver_0_7_0 serde_1_0_10 serde_derive_1_0_10 serde_json_1_0_2 toml_0_4_2 ]); + features = mkFeatures (features.cargo_edit_0_2_0 or {}); + }; + cargo_edit_0_2_0_features = f: updateFeatures f (rec { + cargo_edit_0_2_0.default = (f.cargo_edit_0_2_0.default or true); + docopt_0_8_1.default = true; + pad_0_1_4.default = true; + quick_error_1_2_0.default = true; + regex_0_2_2.default = true; + reqwest_0_7_1.default = true; + semver_0_7_0.default = true; + semver_0_7_0.serde = true; + serde_1_0_10.default = true; + serde_derive_1_0_10.default = true; + serde_json_1_0_2.default = true; + toml_0_4_2.default = true; + }) [ docopt_0_8_1_features pad_0_1_4_features quick_error_1_2_0_features regex_0_2_2_features reqwest_0_7_1_features semver_0_7_0_features serde_1_0_10_features serde_derive_1_0_10_features serde_json_1_0_2_features toml_0_4_2_features ]; + cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; + cfg_if_0_1_2_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); + }) []; + colored_1_5_2 = { features?(colored_1_5_2_features {}) }: colored_1_5_2_ { + dependencies = mapFeatures features ([ lazy_static_0_2_8 ]); + features = mkFeatures (features.colored_1_5_2 or {}); + }; + colored_1_5_2_features = f: updateFeatures f (rec { + colored_1_5_2.default = (f.colored_1_5_2.default or true); + lazy_static_0_2_8.default = true; + }) [ lazy_static_0_2_8_features ]; + core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]); + }; + core_foundation_0_2_3_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true); + core_foundation_sys_0_2_3.default = true; + libc_0_2_26.default = true; + }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ]; + core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + }; + core_foundation_sys_0_2_3_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true); + libc_0_2_26.default = true; + }) [ libc_0_2_26_features ]; + crypt32_sys_0_2_0 = { features?(crypt32_sys_0_2_0_features {}) }: crypt32_sys_0_2_0_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + crypt32_sys_0_2_0_features = f: updateFeatures f (rec { + crypt32_sys_0_2_0.default = (f.crypt32_sys_0_2_0.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + dbghelp_sys_0_2_0_features = f: updateFeatures f (rec { + dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + difference_1_0_0 = { features?(difference_1_0_0_features {}) }: difference_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.difference_1_0_0 or {}); + }; + difference_1_0_0_features = f: updateFeatures f (rec { + difference_1_0_0.default = (f.difference_1_0_0.default or true); + difference_1_0_0.getopts = + (f.difference_1_0_0.getopts or false) || + (f.difference_1_0_0.bin or false) || + (difference_1_0_0.bin or false); + }) []; + docopt_0_8_1 = { features?(docopt_0_8_1_features {}) }: docopt_0_8_1_ { + dependencies = mapFeatures features ([ lazy_static_0_2_8 regex_0_2_2 serde_1_0_10 serde_derive_1_0_10 strsim_0_6_0 ]); + }; + docopt_0_8_1_features = f: updateFeatures f (rec { + docopt_0_8_1.default = (f.docopt_0_8_1.default or true); + lazy_static_0_2_8.default = true; + regex_0_2_2.default = true; + serde_1_0_10.default = true; + serde_derive_1_0_10.default = true; + strsim_0_6_0.default = true; + }) [ lazy_static_0_2_8_features regex_0_2_2_features serde_1_0_10_features serde_derive_1_0_10_features strsim_0_6_0_features ]; + dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; + dtoa_0_4_1_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); + }) []; + error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ { + dependencies = mapFeatures features ([ ] + ++ (if features.error_chain_0_10_0.backtrace or false then [ backtrace_0_3_2 ] else [])); + features = mkFeatures (features.error_chain_0_10_0 or {}); + }; + error_chain_0_10_0_features = f: updateFeatures f (rec { + backtrace_0_3_2.default = true; + error_chain_0_10_0.backtrace = + (f.error_chain_0_10_0.backtrace or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true); + error_chain_0_10_0.example_generated = + (f.error_chain_0_10_0.example_generated or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + }) [ backtrace_0_3_2_features ]; + foreign_types_0_2_0 = { features?(foreign_types_0_2_0_features {}) }: foreign_types_0_2_0_ {}; + foreign_types_0_2_0_features = f: updateFeatures f (rec { + foreign_types_0_2_0.default = (f.foreign_types_0_2_0.default or true); + }) []; + futures_0_1_14 = { features?(futures_0_1_14_features {}) }: futures_0_1_14_ { + features = mkFeatures (features.futures_0_1_14 or {}); + }; + futures_0_1_14_features = f: updateFeatures f (rec { + futures_0_1_14.default = (f.futures_0_1_14.default or true); + futures_0_1_14.use_std = + (f.futures_0_1_14.use_std or false) || + (f.futures_0_1_14.default or false) || + (futures_0_1_14.default or false); + futures_0_1_14.with-deprecated = + (f.futures_0_1_14.with-deprecated or false) || + (f.futures_0_1_14.default or false) || + (futures_0_1_14.default or false); + }) []; + futures_cpupool_0_1_5 = { features?(futures_cpupool_0_1_5_features {}) }: futures_cpupool_0_1_5_ { + dependencies = mapFeatures features ([ futures_0_1_14 num_cpus_1_6_2 ]); + features = mkFeatures (features.futures_cpupool_0_1_5 or {}); + }; + futures_cpupool_0_1_5_features = f: updateFeatures f (rec { + futures_0_1_14.default = (f.futures_0_1_14.default or false); + futures_0_1_14.use_std = true; + futures_0_1_14.with-deprecated = + (f.futures_0_1_14.with-deprecated or false) || + (futures_cpupool_0_1_5.with-deprecated or false) || + (f.futures_cpupool_0_1_5.with-deprecated or false); + futures_cpupool_0_1_5.default = (f.futures_cpupool_0_1_5.default or true); + futures_cpupool_0_1_5.with-deprecated = + (f.futures_cpupool_0_1_5.with-deprecated or false) || + (f.futures_cpupool_0_1_5.default or false) || + (futures_cpupool_0_1_5.default or false); + num_cpus_1_6_2.default = true; + }) [ futures_0_1_14_features num_cpus_1_6_2_features ]; + gcc_0_3_51 = { features?(gcc_0_3_51_features {}) }: gcc_0_3_51_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.gcc_0_3_51 or {}); + }; + gcc_0_3_51_features = f: updateFeatures f (rec { + gcc_0_3_51.default = (f.gcc_0_3_51.default or true); + gcc_0_3_51.rayon = + (f.gcc_0_3_51.rayon or false) || + (f.gcc_0_3_51.parallel or false) || + (gcc_0_3_51.parallel or false); + }) []; + getopts_0_2_14 = { features?(getopts_0_2_14_features {}) }: getopts_0_2_14_ {}; + getopts_0_2_14_features = f: updateFeatures f (rec { + getopts_0_2_14.default = (f.getopts_0_2_14.default or true); + }) []; + httparse_1_2_3 = { features?(httparse_1_2_3_features {}) }: httparse_1_2_3_ { + features = mkFeatures (features.httparse_1_2_3 or {}); + }; + httparse_1_2_3_features = f: updateFeatures f (rec { + httparse_1_2_3.default = (f.httparse_1_2_3.default or true); + httparse_1_2_3.std = + (f.httparse_1_2_3.std or false) || + (f.httparse_1_2_3.default or false) || + (httparse_1_2_3.default or false); + }) []; + hyper_0_11_1 = { features?(hyper_0_11_1_features {}) }: hyper_0_11_1_ { + dependencies = mapFeatures features ([ base64_0_6_0 bytes_0_4_4 futures_0_1_14 futures_cpupool_0_1_5 httparse_1_2_3 language_tags_0_2_2 log_0_3_8 mime_0_3_2 percent_encoding_1_0_0 time_0_1_38 tokio_core_0_1_8 tokio_io_0_1_2 tokio_proto_0_1_1 tokio_service_0_1_0 unicase_2_0_0 ]); + features = mkFeatures (features.hyper_0_11_1 or {}); + }; + hyper_0_11_1_features = f: updateFeatures f (rec { + base64_0_6_0.default = true; + bytes_0_4_4.default = true; + futures_0_1_14.default = true; + futures_cpupool_0_1_5.default = true; + httparse_1_2_3.default = true; + hyper_0_11_1.default = (f.hyper_0_11_1.default or true); + language_tags_0_2_2.default = true; + log_0_3_8.default = true; + mime_0_3_2.default = true; + percent_encoding_1_0_0.default = true; + time_0_1_38.default = true; + tokio_core_0_1_8.default = true; + tokio_io_0_1_2.default = true; + tokio_proto_0_1_1.default = true; + tokio_service_0_1_0.default = true; + unicase_2_0_0.default = true; + }) [ base64_0_6_0_features bytes_0_4_4_features futures_0_1_14_features futures_cpupool_0_1_5_features httparse_1_2_3_features language_tags_0_2_2_features log_0_3_8_features mime_0_3_2_features percent_encoding_1_0_0_features time_0_1_38_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_0_0_features ]; + hyper_tls_0_1_2 = { features?(hyper_tls_0_1_2_features {}) }: hyper_tls_0_1_2_ { + dependencies = mapFeatures features ([ futures_0_1_14 hyper_0_11_1 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 tokio_tls_0_1_3 ]); + }; + hyper_tls_0_1_2_features = f: updateFeatures f (rec { + futures_0_1_14.default = true; + hyper_0_11_1.default = true; + hyper_tls_0_1_2.default = (f.hyper_tls_0_1_2.default or true); + native_tls_0_1_4.default = true; + tokio_core_0_1_8.default = true; + tokio_io_0_1_2.default = true; + tokio_service_0_1_0.default = true; + tokio_tls_0_1_3.default = true; + }) [ futures_0_1_14_features hyper_0_11_1_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features tokio_tls_0_1_3_features ]; + idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { + dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]); + }; + idna_0_1_4_features = f: updateFeatures f (rec { + idna_0_1_4.default = (f.idna_0_1_4.default or true); + matches_0_1_6.default = true; + unicode_bidi_0_3_4.default = true; + unicode_normalization_0_1_5.default = true; + }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_5_features ]; + iovec_0_1_0 = { features?(iovec_0_1_0_features {}) }: iovec_0_1_0_ { + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + }; + iovec_0_1_0_features = f: updateFeatures f (rec { + iovec_0_1_0.default = (f.iovec_0_1_0.default or true); + libc_0_2_26.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_26_features winapi_0_2_8_features ]; + itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; + itoa_0_3_1_features = f: updateFeatures f (rec { + itoa_0_3_1.default = (f.itoa_0_3_1.default or true); + }) []; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.language_tags_0_2_2 or {}); + }; + language_tags_0_2_2_features = f: updateFeatures f (rec { + language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true); + language_tags_0_2_2.heapsize = + (f.language_tags_0_2_2.heapsize or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + language_tags_0_2_2.heapsize_plugin = + (f.language_tags_0_2_2.heapsize_plugin or false) || + (f.language_tags_0_2_2.heap_size or false) || + (language_tags_0_2_2.heap_size or false); + }) []; + lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_8 or {}); + }; + lazy_static_0_2_8_features = f: updateFeatures f (rec { + lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true); + lazy_static_0_2_8.nightly = + (f.lazy_static_0_2_8.nightly or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + lazy_static_0_2_8.spin = + (f.lazy_static_0_2_8.spin or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + }) []; + lazycell_0_4_0 = { features?(lazycell_0_4_0_features {}) }: lazycell_0_4_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazycell_0_4_0 or {}); + }; + lazycell_0_4_0_features = f: updateFeatures f (rec { + lazycell_0_4_0.clippy = + (f.lazycell_0_4_0.clippy or false) || + (f.lazycell_0_4_0.nightly-testing or false) || + (lazycell_0_4_0.nightly-testing or false); + lazycell_0_4_0.default = (f.lazycell_0_4_0.default or true); + lazycell_0_4_0.nightly = + (f.lazycell_0_4_0.nightly or false) || + (f.lazycell_0_4_0.nightly-testing or false) || + (lazycell_0_4_0.nightly-testing or false); + }) []; + libc_0_2_26 = { features?(libc_0_2_26_features {}) }: libc_0_2_26_ { + features = mkFeatures (features.libc_0_2_26 or {}); + }; + libc_0_2_26_features = f: updateFeatures f (rec { + libc_0_2_26.default = (f.libc_0_2_26.default or true); + libc_0_2_26.use_std = + (f.libc_0_2_26.use_std or false) || + (f.libc_0_2_26.default or false) || + (libc_0_2_26.default or false); + }) []; + libflate_0_1_10 = { features?(libflate_0_1_10_features {}) }: libflate_0_1_10_ { + dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_1_0 ]); + }; + libflate_0_1_10_features = f: updateFeatures f (rec { + adler32_1_0_0.default = true; + byteorder_1_1_0.default = true; + libflate_0_1_10.default = (f.libflate_0_1_10.default or true); + }) [ adler32_1_0_0_features byteorder_1_1_0_features ]; + log_0_3_8 = { features?(log_0_3_8_features {}) }: log_0_3_8_ { + features = mkFeatures (features.log_0_3_8 or {}); + }; + log_0_3_8_features = f: updateFeatures f (rec { + log_0_3_8.default = (f.log_0_3_8.default or true); + log_0_3_8.use_std = + (f.log_0_3_8.use_std or false) || + (f.log_0_3_8.default or false) || + (log_0_3_8.default or false); + }) []; + matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; + matches_0_1_6_features = f: updateFeatures f (rec { + matches_0_1_6.default = (f.matches_0_1_6.default or true); + }) []; + memchr_1_0_1 = { features?(memchr_1_0_1_features {}) }: memchr_1_0_1_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + features = mkFeatures (features.memchr_1_0_1 or {}); + }; + memchr_1_0_1_features = f: updateFeatures f (rec { + libc_0_2_26.default = (f.libc_0_2_26.default or false); + libc_0_2_26.use_std = + (f.libc_0_2_26.use_std or false) || + (memchr_1_0_1.use_std or false) || + (f.memchr_1_0_1.use_std or false); + memchr_1_0_1.default = (f.memchr_1_0_1.default or true); + memchr_1_0_1.use_std = + (f.memchr_1_0_1.use_std or false) || + (f.memchr_1_0_1.default or false) || + (memchr_1_0_1.default or false); + }) [ libc_0_2_26_features ]; + mime_0_3_2 = { features?(mime_0_3_2_features {}) }: mime_0_3_2_ { + dependencies = mapFeatures features ([ unicase_2_0_0 ]); + }; + mime_0_3_2_features = f: updateFeatures f (rec { + mime_0_3_2.default = (f.mime_0_3_2.default or true); + unicase_2_0_0.default = true; + }) [ unicase_2_0_0_features ]; + mio_0_6_9 = { features?(mio_0_6_9_features {}) }: mio_0_6_9_ { + dependencies = mapFeatures features ([ iovec_0_1_0 lazycell_0_4_0 log_0_3_8 net2_0_2_30 slab_0_3_0 ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []); + features = mkFeatures (features.mio_0_6_9 or {}); + }; + mio_0_6_9_features = f: updateFeatures f (rec { + iovec_0_1_0.default = true; + kernel32_sys_0_2_2.default = true; + lazycell_0_4_0.default = true; + libc_0_2_26.default = true; + log_0_3_8.default = true; + mio_0_6_9.default = (f.mio_0_6_9.default or true); + mio_0_6_9.with-deprecated = + (f.mio_0_6_9.with-deprecated or false) || + (f.mio_0_6_9.default or false) || + (mio_0_6_9.default or false); + miow_0_2_1.default = true; + net2_0_2_30.default = true; + slab_0_3_0.default = true; + winapi_0_2_8.default = true; + }) [ iovec_0_1_0_features lazycell_0_4_0_features log_0_3_8_features net2_0_2_30_features slab_0_3_0_features libc_0_2_26_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ]; + miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_30 winapi_0_2_8 ws2_32_sys_0_2_1 ]); + }; + miow_0_2_1_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + miow_0_2_1.default = (f.miow_0_2_1.default or true); + net2_0_2_30.default = (f.net2_0_2_30.default or false); + winapi_0_2_8.default = true; + ws2_32_sys_0_2_1.default = true; + }) [ kernel32_sys_0_2_2_features net2_0_2_30_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ]; + native_tls_0_1_4 = { features?(native_tls_0_1_4_features {}) }: native_tls_0_1_4_ { + dependencies = (if !(kernel == "windows" || kernel == "darwin") then mapFeatures features ([ openssl_0_9_14 ]) else []) + ++ (if kernel == "darwin" then mapFeatures features ([ security_framework_0_1_14 security_framework_sys_0_1_14 tempdir_0_3_5 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_7 ]) else []); + }; + native_tls_0_1_4_features = f: updateFeatures f (rec { + native_tls_0_1_4.default = (f.native_tls_0_1_4.default or true); + openssl_0_9_14.default = true; + schannel_0_1_7.default = true; + security_framework_0_1_14.OSX_10_8 = true; + security_framework_0_1_14.default = true; + security_framework_sys_0_1_14.default = true; + tempdir_0_3_5.default = true; + }) [ openssl_0_9_14_features security_framework_0_1_14_features security_framework_sys_0_1_14_features tempdir_0_3_5_features schannel_0_1_7_features ]; + net2_0_2_30 = { features?(net2_0_2_30_features {}) }: net2_0_2_30_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ]) else []) + ++ (if kernel == "i686-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "i686-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "x86_64-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else []) + ++ (if kernel == "x86_64-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []); + features = mkFeatures (features.net2_0_2_30 or {}); + }; + net2_0_2_30_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = true; + kernel32_sys_0_2_2.default = true; + libc_0_2_26.default = true; + net2_0_2_30.default = (f.net2_0_2_30.default or true); + net2_0_2_30.duration = + (f.net2_0_2_30.duration or false) || + (f.net2_0_2_30.default or false) || + (net2_0_2_30.default or false); + winapi_0_2_8.default = true; + ws2_32_sys_0_2_1.default = true; + }) [ cfg_if_0_1_2_features libc_0_2_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ws2_32_sys_0_2_1_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features ]; + num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; + num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + }) []; + num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + }; + num_cpus_1_6_2_features = f: updateFeatures f (rec { + libc_0_2_26.default = true; + num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); + }) [ libc_0_2_26_features ]; + openssl_0_9_14 = { features?(openssl_0_9_14_features {}) }: openssl_0_9_14_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_8 libc_0_2_26 openssl_sys_0_9_14 ]); + features = mkFeatures (features.openssl_0_9_14 or {}); + }; + openssl_0_9_14_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + foreign_types_0_2_0.default = true; + lazy_static_0_2_8.default = true; + libc_0_2_26.default = true; + openssl_0_9_14.default = (f.openssl_0_9_14.default or true); + openssl_sys_0_9_14.default = true; + }) [ bitflags_0_9_1_features foreign_types_0_2_0_features lazy_static_0_2_8_features libc_0_2_26_features openssl_sys_0_9_14_features ]; + openssl_sys_0_9_14 = { features?(openssl_sys_0_9_14_features {}) }: openssl_sys_0_9_14_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + buildDependencies = mapFeatures features ([ gcc_0_3_51 pkg_config_0_3_9 ]); + }; + openssl_sys_0_9_14_features = f: updateFeatures f (rec { + gcc_0_3_51.default = true; + libc_0_2_26.default = true; + openssl_sys_0_9_14.default = (f.openssl_sys_0_9_14.default or true); + pkg_config_0_3_9.default = true; + }) [ libc_0_2_26_features gcc_0_3_51_features pkg_config_0_3_9_features ]; + pad_0_1_4 = { features?(pad_0_1_4_features {}) }: pad_0_1_4_ { + dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); + }; + pad_0_1_4_features = f: updateFeatures f (rec { + pad_0_1_4.default = (f.pad_0_1_4.default or true); + unicode_width_0_1_4.default = true; + }) [ unicode_width_0_1_4_features ]; + percent_encoding_1_0_0 = { features?(percent_encoding_1_0_0_features {}) }: percent_encoding_1_0_0_ {}; + percent_encoding_1_0_0_features = f: updateFeatures f (rec { + percent_encoding_1_0_0.default = (f.percent_encoding_1_0_0.default or true); + }) []; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + pretty_assertions_0_2_1 = { features?(pretty_assertions_0_2_1_features {}) }: pretty_assertions_0_2_1_ { + dependencies = mapFeatures features ([ difference_1_0_0 ]); + }; + pretty_assertions_0_2_1_features = f: updateFeatures f (rec { + difference_1_0_0.default = true; + pretty_assertions_0_2_1.default = (f.pretty_assertions_0_2_1.default or true); + }) [ difference_1_0_0_features ]; + pulldown_cmark_0_0_3 = { features?(pulldown_cmark_0_0_3_features {}) }: pulldown_cmark_0_0_3_ { + dependencies = mapFeatures features ([ getopts_0_2_14 ]); + }; + pulldown_cmark_0_0_3_features = f: updateFeatures f (rec { + getopts_0_2_14.default = true; + pulldown_cmark_0_0_3.default = (f.pulldown_cmark_0_0_3.default or true); + }) [ getopts_0_2_14_features ]; + quick_error_1_2_0 = { features?(quick_error_1_2_0_features {}) }: quick_error_1_2_0_ {}; + quick_error_1_2_0_features = f: updateFeatures f (rec { + quick_error_1_2_0.default = (f.quick_error_1_2_0.default or true); + }) []; + quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; + quote_0_3_15_features = f: updateFeatures f (rec { + quote_0_3_15.default = (f.quote_0_3_15.default or true); + }) []; + rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]); + }; + rand_0_3_15_features = f: updateFeatures f (rec { + libc_0_2_26.default = true; + rand_0_3_15.default = (f.rand_0_3_15.default or true); + }) [ libc_0_2_26_features ]; + redox_syscall_0_1_26 = { features?(redox_syscall_0_1_26_features {}) }: redox_syscall_0_1_26_ {}; + redox_syscall_0_1_26_features = f: updateFeatures f (rec { + redox_syscall_0_1_26.default = (f.redox_syscall_0_1_26.default or true); + }) []; + regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_1 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_0_2_2 or {}); + }; + regex_0_2_2_features = f: updateFeatures f (rec { + aho_corasick_0_6_3.default = true; + memchr_1_0_1.default = true; + regex_0_2_2.default = (f.regex_0_2_2.default or true); + regex_0_2_2.simd = + (f.regex_0_2_2.simd or false) || + (f.regex_0_2_2.simd-accel or false) || + (regex_0_2_2.simd-accel or false); + regex_syntax_0_4_1.default = true; + thread_local_0_3_4.default = true; + utf8_ranges_1_0_0.default = true; + }) [ aho_corasick_0_6_3_features memchr_1_0_1_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {}; + regex_syntax_0_4_1_features = f: updateFeatures f (rec { + regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true); + }) []; + reqwest_0_7_1 = { features?(reqwest_0_7_1_features {}) }: reqwest_0_7_1_ { + dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 hyper_0_11_1 hyper_tls_0_1_2 libflate_0_1_10 log_0_3_8 native_tls_0_1_4 serde_1_0_10 serde_json_1_0_2 serde_urlencoded_0_5_1 tokio_core_0_1_8 tokio_io_0_1_2 tokio_tls_0_1_3 url_1_5_1 ]); + features = mkFeatures (features.reqwest_0_7_1 or {}); + }; + reqwest_0_7_1_features = f: updateFeatures f (rec { + bytes_0_4_4.default = true; + futures_0_1_14.default = true; + hyper_0_11_1.default = true; + hyper_tls_0_1_2.default = true; + libflate_0_1_10.default = true; + log_0_3_8.default = true; + native_tls_0_1_4.default = true; + reqwest_0_7_1.default = (f.reqwest_0_7_1.default or true); + serde_1_0_10.default = true; + serde_json_1_0_2.default = true; + serde_urlencoded_0_5_1.default = true; + tokio_core_0_1_8.default = true; + tokio_io_0_1_2.default = true; + tokio_tls_0_1_3.default = true; + url_1_5_1.default = true; + }) [ bytes_0_4_4_features futures_0_1_14_features hyper_0_11_1_features hyper_tls_0_1_2_features libflate_0_1_10_features log_0_3_8_features native_tls_0_1_4_features serde_1_0_10_features serde_json_1_0_2_features serde_urlencoded_0_5_1_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_tls_0_1_3_features url_1_5_1_features ]; + rustc_demangle_0_1_4 = { features?(rustc_demangle_0_1_4_features {}) }: rustc_demangle_0_1_4_ {}; + rustc_demangle_0_1_4_features = f: updateFeatures f (rec { + rustc_demangle_0_1_4.default = (f.rustc_demangle_0_1_4.default or true); + }) []; + rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { + dependencies = mapFeatures features ([ semver_0_1_20 ]); + }; + rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); + semver_0_1_20.default = true; + }) [ semver_0_1_20_features ]; + safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {}; + safemem_0_2_0_features = f: updateFeatures f (rec { + safemem_0_2_0.default = (f.safemem_0_2_0.default or true); + }) []; + schannel_0_1_7 = { features?(schannel_0_1_7_features {}) }: schannel_0_1_7_ { + dependencies = mapFeatures features ([ advapi32_sys_0_2_0 crypt32_sys_0_2_0 kernel32_sys_0_2_2 lazy_static_0_2_8 secur32_sys_0_2_0 winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + schannel_0_1_7_features = f: updateFeatures f (rec { + advapi32_sys_0_2_0.default = true; + crypt32_sys_0_2_0.default = true; + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_8.default = true; + schannel_0_1_7.default = (f.schannel_0_1_7.default or true); + secur32_sys_0_2_0.default = true; + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ advapi32_sys_0_2_0_features crypt32_sys_0_2_0_features kernel32_sys_0_2_2_features lazy_static_0_2_8_features secur32_sys_0_2_0_features winapi_0_2_8_features winapi_build_0_1_1_features ]; + scoped_tls_0_1_0 = { features?(scoped_tls_0_1_0_features {}) }: scoped_tls_0_1_0_ {}; + scoped_tls_0_1_0_features = f: updateFeatures f (rec { + scoped_tls_0_1_0.default = (f.scoped_tls_0_1_0.default or true); + }) []; + secur32_sys_0_2_0 = { features?(secur32_sys_0_2_0_features {}) }: secur32_sys_0_2_0_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + secur32_sys_0_2_0_features = f: updateFeatures f (rec { + secur32_sys_0_2_0.default = (f.secur32_sys_0_2_0.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + security_framework_0_1_14 = { features?(security_framework_0_1_14_features {}) }: security_framework_0_1_14_ { + dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_26 security_framework_sys_0_1_14 ]); + features = mkFeatures (features.security_framework_0_1_14 or {}); + }; + security_framework_0_1_14_features = f: updateFeatures f (rec { + core_foundation_0_2_3.default = true; + core_foundation_sys_0_2_3.default = true; + libc_0_2_26.default = true; + security_framework_0_1_14.OSX_10_10 = + (f.security_framework_0_1_14.OSX_10_10 or false) || + (f.security_framework_0_1_14.OSX_10_11 or false) || + (security_framework_0_1_14.OSX_10_11 or false); + security_framework_0_1_14.OSX_10_8 = + (f.security_framework_0_1_14.OSX_10_8 or false) || + (f.security_framework_0_1_14.OSX_10_9 or false) || + (security_framework_0_1_14.OSX_10_9 or false); + security_framework_0_1_14.OSX_10_9 = + (f.security_framework_0_1_14.OSX_10_9 or false) || + (f.security_framework_0_1_14.OSX_10_10 or false) || + (security_framework_0_1_14.OSX_10_10 or false); + security_framework_0_1_14.default = (f.security_framework_0_1_14.default or true); + security_framework_sys_0_1_14.OSX_10_10 = + (f.security_framework_sys_0_1_14.OSX_10_10 or false) || + (security_framework_0_1_14.OSX_10_10 or false) || + (f.security_framework_0_1_14.OSX_10_10 or false); + security_framework_sys_0_1_14.OSX_10_11 = + (f.security_framework_sys_0_1_14.OSX_10_11 or false) || + (security_framework_0_1_14.OSX_10_11 or false) || + (f.security_framework_0_1_14.OSX_10_11 or false); + security_framework_sys_0_1_14.OSX_10_8 = + (f.security_framework_sys_0_1_14.OSX_10_8 or false) || + (security_framework_0_1_14.OSX_10_8 or false) || + (f.security_framework_0_1_14.OSX_10_8 or false); + security_framework_sys_0_1_14.OSX_10_9 = + (f.security_framework_sys_0_1_14.OSX_10_9 or false) || + (security_framework_0_1_14.OSX_10_9 or false) || + (f.security_framework_0_1_14.OSX_10_9 or false); + security_framework_sys_0_1_14.default = true; + }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_26_features security_framework_sys_0_1_14_features ]; + security_framework_sys_0_1_14 = { features?(security_framework_sys_0_1_14_features {}) }: security_framework_sys_0_1_14_ { + dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]); + features = mkFeatures (features.security_framework_sys_0_1_14 or {}); + }; + security_framework_sys_0_1_14_features = f: updateFeatures f (rec { + core_foundation_sys_0_2_3.default = true; + libc_0_2_26.default = true; + security_framework_sys_0_1_14.OSX_10_10 = + (f.security_framework_sys_0_1_14.OSX_10_10 or false) || + (f.security_framework_sys_0_1_14.OSX_10_11 or false) || + (security_framework_sys_0_1_14.OSX_10_11 or false); + security_framework_sys_0_1_14.OSX_10_8 = + (f.security_framework_sys_0_1_14.OSX_10_8 or false) || + (f.security_framework_sys_0_1_14.OSX_10_9 or false) || + (security_framework_sys_0_1_14.OSX_10_9 or false); + security_framework_sys_0_1_14.OSX_10_9 = + (f.security_framework_sys_0_1_14.OSX_10_9 or false) || + (f.security_framework_sys_0_1_14.OSX_10_10 or false) || + (security_framework_sys_0_1_14.OSX_10_10 or false); + security_framework_sys_0_1_14.default = (f.security_framework_sys_0_1_14.default or true); + }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ]; + semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; + semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20.default = (f.semver_0_1_20.default or true); + }) []; + semver_0_7_0 = { features?(semver_0_7_0_features {}) }: semver_0_7_0_ { + dependencies = mapFeatures features ([ semver_parser_0_7_0 ] + ++ (if features.semver_0_7_0.serde or false then [ serde_1_0_10 ] else [])); + features = mkFeatures (features.semver_0_7_0 or {}); + }; + semver_0_7_0_features = f: updateFeatures f (rec { + semver_0_7_0.default = (f.semver_0_7_0.default or true); + semver_0_7_0.serde = + (f.semver_0_7_0.serde or false) || + (f.semver_0_7_0.ci or false) || + (semver_0_7_0.ci or false); + semver_parser_0_7_0.default = true; + serde_1_0_10.default = true; + }) [ semver_parser_0_7_0_features serde_1_0_10_features ]; + semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; + semver_parser_0_7_0_features = f: updateFeatures f (rec { + semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); + }) []; + serde_1_0_10 = { features?(serde_1_0_10_features {}) }: serde_1_0_10_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_1_0_10 or {}); + }; + serde_1_0_10_features = f: updateFeatures f (rec { + serde_1_0_10.default = (f.serde_1_0_10.default or true); + serde_1_0_10.serde_derive = + (f.serde_1_0_10.serde_derive or false) || + (f.serde_1_0_10.derive or false) || + (serde_1_0_10.derive or false) || + (f.serde_1_0_10.playground or false) || + (serde_1_0_10.playground or false); + serde_1_0_10.std = + (f.serde_1_0_10.std or false) || + (f.serde_1_0_10.default or false) || + (serde_1_0_10.default or false); + serde_1_0_10.unstable = + (f.serde_1_0_10.unstable or false) || + (f.serde_1_0_10.alloc or false) || + (serde_1_0_10.alloc or false); + }) []; + serde_derive_1_0_10 = { features?(serde_derive_1_0_10_features {}) }: serde_derive_1_0_10_ { + dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_15_1 syn_0_11_11 ]); + }; + serde_derive_1_0_10_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + serde_derive_1_0_10.default = (f.serde_derive_1_0_10.default or true); + serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or false); + syn_0_11_11.default = true; + syn_0_11_11.visit = true; + }) [ quote_0_3_15_features serde_derive_internals_0_15_1_features syn_0_11_11_features ]; + serde_derive_internals_0_15_1 = { features?(serde_derive_internals_0_15_1_features {}) }: serde_derive_internals_0_15_1_ { + dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]); + }; + serde_derive_internals_0_15_1_features = f: updateFeatures f (rec { + serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or true); + syn_0_11_11.default = (f.syn_0_11_11.default or false); + syn_0_11_11.parsing = true; + synom_0_11_3.default = true; + }) [ syn_0_11_11_features synom_0_11_3_features ]; + serde_json_1_0_2 = { features?(serde_json_1_0_2_features {}) }: serde_json_1_0_2_ { + dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_40 serde_1_0_10 ]); + features = mkFeatures (features.serde_json_1_0_2 or {}); + }; + serde_json_1_0_2_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = true; + itoa_0_3_1.default = true; + num_traits_0_1_40.default = true; + serde_1_0_10.default = true; + serde_json_1_0_2.default = (f.serde_json_1_0_2.default or true); + serde_json_1_0_2.linked-hash-map = + (f.serde_json_1_0_2.linked-hash-map or false) || + (f.serde_json_1_0_2.preserve_order or false) || + (serde_json_1_0_2.preserve_order or false); + }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_40_features serde_1_0_10_features ]; + serde_urlencoded_0_5_1 = { features?(serde_urlencoded_0_5_1_features {}) }: serde_urlencoded_0_5_1_ { + dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 serde_1_0_10 url_1_5_1 ]); + }; + serde_urlencoded_0_5_1_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = true; + itoa_0_3_1.default = true; + serde_1_0_10.default = true; + serde_urlencoded_0_5_1.default = (f.serde_urlencoded_0_5_1.default or true); + url_1_5_1.default = true; + }) [ dtoa_0_4_1_features itoa_0_3_1_features serde_1_0_10_features url_1_5_1_features ]; + skeptic_0_5_0 = { features?(skeptic_0_5_0_features {}) }: skeptic_0_5_0_ { + dependencies = mapFeatures features ([ pulldown_cmark_0_0_3 tempdir_0_3_5 ]); + }; + skeptic_0_5_0_features = f: updateFeatures f (rec { + pulldown_cmark_0_0_3.default = true; + skeptic_0_5_0.default = (f.skeptic_0_5_0.default or true); + tempdir_0_3_5.default = true; + }) [ pulldown_cmark_0_0_3_features tempdir_0_3_5_features ]; + slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {}; + slab_0_3_0_features = f: updateFeatures f (rec { + slab_0_3_0.default = (f.slab_0_3_0.default or true); + }) []; + smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {}; + smallvec_0_2_1_features = f: updateFeatures f (rec { + smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { + dependencies = mapFeatures features ([ ] + ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) + ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) + ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); + features = mkFeatures (features.syn_0_11_11 or {}); + }; + syn_0_11_11_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + syn_0_11_11.default = (f.syn_0_11_11.default or true); + syn_0_11_11.parsing = + (f.syn_0_11_11.parsing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.printing = + (f.syn_0_11_11.printing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.quote = + (f.syn_0_11_11.quote or false) || + (f.syn_0_11_11.printing or false) || + (syn_0_11_11.printing or false); + syn_0_11_11.synom = + (f.syn_0_11_11.synom or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + syn_0_11_11.unicode-xid = + (f.syn_0_11_11.unicode-xid or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + synom_0_11_3.default = true; + unicode_xid_0_0_4.default = true; + }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; + synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { + dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); + }; + synom_0_11_3_features = f: updateFeatures f (rec { + synom_0_11_3.default = (f.synom_0_11_3.default or true); + unicode_xid_0_0_4.default = true; + }) [ unicode_xid_0_0_4_features ]; + take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {}; + take_0_1_0_features = f: updateFeatures f (rec { + take_0_1_0.default = (f.take_0_1_0.default or true); + }) []; + tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ { + dependencies = mapFeatures features ([ rand_0_3_15 ]); + }; + tempdir_0_3_5_features = f: updateFeatures f (rec { + rand_0_3_15.default = true; + tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true); + }) [ rand_0_3_15_features ]; + thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_8 unreachable_1_0_0 ]); + }; + thread_local_0_3_4_features = f: updateFeatures f (rec { + lazy_static_0_2_8.default = true; + thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true); + unreachable_1_0_0.default = true; + }) [ lazy_static_0_2_8_features unreachable_1_0_0_features ]; + time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ { + dependencies = mapFeatures features ([ libc_0_2_26 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_26 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + time_0_1_38_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_26.default = true; + redox_syscall_0_1_26.default = true; + time_0_1_38.default = (f.time_0_1_38.default or true); + winapi_0_2_8.default = true; + }) [ libc_0_2_26_features redox_syscall_0_1_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + tokio_core_0_1_8 = { features?(tokio_core_0_1_8_features {}) }: tokio_core_0_1_8_ { + dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 iovec_0_1_0 log_0_3_8 mio_0_6_9 scoped_tls_0_1_0 slab_0_3_0 tokio_io_0_1_2 ]); + }; + tokio_core_0_1_8_features = f: updateFeatures f (rec { + bytes_0_4_4.default = true; + futures_0_1_14.default = true; + iovec_0_1_0.default = true; + log_0_3_8.default = true; + mio_0_6_9.default = true; + scoped_tls_0_1_0.default = true; + slab_0_3_0.default = true; + tokio_core_0_1_8.default = (f.tokio_core_0_1_8.default or true); + tokio_io_0_1_2.default = true; + }) [ bytes_0_4_4_features futures_0_1_14_features iovec_0_1_0_features log_0_3_8_features mio_0_6_9_features scoped_tls_0_1_0_features slab_0_3_0_features tokio_io_0_1_2_features ]; + tokio_io_0_1_2 = { features?(tokio_io_0_1_2_features {}) }: tokio_io_0_1_2_ { + dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 log_0_3_8 ]); + }; + tokio_io_0_1_2_features = f: updateFeatures f (rec { + bytes_0_4_4.default = true; + futures_0_1_14.default = true; + log_0_3_8.default = true; + tokio_io_0_1_2.default = (f.tokio_io_0_1_2.default or true); + }) [ bytes_0_4_4_features futures_0_1_14_features log_0_3_8_features ]; + tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ { + dependencies = mapFeatures features ([ futures_0_1_14 log_0_3_8 net2_0_2_30 rand_0_3_15 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 ]); + }; + tokio_proto_0_1_1_features = f: updateFeatures f (rec { + futures_0_1_14.default = true; + log_0_3_8.default = true; + net2_0_2_30.default = true; + rand_0_3_15.default = true; + slab_0_3_0.default = true; + smallvec_0_2_1.default = true; + take_0_1_0.default = true; + tokio_core_0_1_8.default = true; + tokio_io_0_1_2.default = true; + tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true); + tokio_service_0_1_0.default = true; + }) [ futures_0_1_14_features log_0_3_8_features net2_0_2_30_features rand_0_3_15_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features ]; + tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ { + dependencies = mapFeatures features ([ futures_0_1_14 ]); + }; + tokio_service_0_1_0_features = f: updateFeatures f (rec { + futures_0_1_14.default = true; + tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true); + }) [ futures_0_1_14_features ]; + tokio_tls_0_1_3 = { features?(tokio_tls_0_1_3_features {}) }: tokio_tls_0_1_3_ { + dependencies = mapFeatures features ([ futures_0_1_14 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 ]) + ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else []) + ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else []) + ++ (if kernel == "windows" then mapFeatures features ([]) else []); + }; + tokio_tls_0_1_3_features = f: updateFeatures f (rec { + futures_0_1_14.default = true; + native_tls_0_1_4.default = true; + tokio_core_0_1_8.default = true; + tokio_io_0_1_2.default = true; + tokio_tls_0_1_3.default = (f.tokio_tls_0_1_3.default or true); + }) [ futures_0_1_14_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features ]; + toml_0_4_2 = { features?(toml_0_4_2_features {}) }: toml_0_4_2_ { + dependencies = mapFeatures features ([ serde_1_0_10 ]); + }; + toml_0_4_2_features = f: updateFeatures f (rec { + serde_1_0_10.default = true; + toml_0_4_2.default = (f.toml_0_4_2.default or true); + }) [ serde_1_0_10_features ]; + unicase_2_0_0 = { features?(unicase_2_0_0_features {}) }: unicase_2_0_0_ { + buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); + features = mkFeatures (features.unicase_2_0_0 or {}); + }; + unicase_2_0_0_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = true; + unicase_2_0_0.default = (f.unicase_2_0_0.default or true); + }) [ rustc_version_0_1_7_features ]; + unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { + dependencies = mapFeatures features ([ matches_0_1_6 ]); + features = mkFeatures (features.unicode_bidi_0_3_4 or {}); + }; + unicode_bidi_0_3_4_features = f: updateFeatures f (rec { + matches_0_1_6.default = true; + unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true); + unicode_bidi_0_3_4.flame = + (f.unicode_bidi_0_3_4.flame or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.flamer = + (f.unicode_bidi_0_3_4.flamer or false) || + (f.unicode_bidi_0_3_4.flame_it or false) || + (unicode_bidi_0_3_4.flame_it or false); + unicode_bidi_0_3_4.serde = + (f.unicode_bidi_0_3_4.serde or false) || + (f.unicode_bidi_0_3_4.with_serde or false) || + (unicode_bidi_0_3_4.with_serde or false); + }) [ matches_0_1_6_features ]; + unicode_normalization_0_1_5 = { features?(unicode_normalization_0_1_5_features {}) }: unicode_normalization_0_1_5_ {}; + unicode_normalization_0_1_5_features = f: updateFeatures f (rec { + unicode_normalization_0_1_5.default = (f.unicode_normalization_0_1_5.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { + features = mkFeatures (features.unicode_xid_0_0_4 or {}); + }; + unicode_xid_0_0_4_features = f: updateFeatures f (rec { + unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + }) []; + unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { + dependencies = mapFeatures features ([ void_1_0_2 ]); + }; + unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); + void_1_0_2.default = (f.void_1_0_2.default or false); + }) [ void_1_0_2_features ]; + url_1_5_1 = { features?(url_1_5_1_features {}) }: url_1_5_1_ { + dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]); + features = mkFeatures (features.url_1_5_1 or {}); + }; + url_1_5_1_features = f: updateFeatures f (rec { + idna_0_1_4.default = true; + matches_0_1_6.default = true; + percent_encoding_1_0_0.default = true; + url_1_5_1.default = (f.url_1_5_1.default or true); + url_1_5_1.encoding = + (f.url_1_5_1.encoding or false) || + (f.url_1_5_1.query_encoding or false) || + (url_1_5_1.query_encoding or false); + url_1_5_1.heapsize = + (f.url_1_5_1.heapsize or false) || + (f.url_1_5_1.heap_size or false) || + (url_1_5_1.heap_size or false); + }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_0_features ]; + utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; + utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); + }) []; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + ws2_32_sys_0_2_1_features = f: updateFeatures f (rec { + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; +} diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index ecb0708eb307..933d41278583 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, zlib, openssl }: +{ stdenv, darwin, defaultCrateOverrides, fetchFromGitHub }: -with rustPlatform; +((import ./cargo-edit.nix).cargo_edit {}).override { + crateOverrides = defaultCrateOverrides // { + cargo-edit = attrs: rec { + name = "cargo-edit-${version}"; + version = "0.2.0"; -buildRustPackage rec { - name = "cargo-edit-${version}"; - version = "0.1.6"; + src = fetchFromGitHub { + owner = "killercup"; + repo = "cargo-edit"; + rev = "v${version}"; + sha256 = "1jxppbb7s50pwg24qxf79fqvm1clwm2zdnv0xlkay7y05nd5bc0c"; + }; - src = fetchFromGitHub { - owner = "killercup"; - repo = "cargo-edit"; - rev = "v${version}"; - sha256 = "16wvix2zkpzl1hhlsvd6mkps8fw5k4n2dvjk9m10gg27pixmiync"; - }; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - buildInputs = [ zlib openssl ]; - - cargoSha256 = "1m4yb7472g1n900dh3xqvdcywk3v01slj3bkk7bk7a9p5x1kyjfn"; - - meta = with stdenv.lib; { - description = "A utility for managing cargo dependencies from the command line"; - homepage = https://github.com/killercup/cargo-edit; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ jb55 ]; - platforms = platforms.all; - broken = true; + meta = with stdenv.lib; { + description = "A utility for managing cargo dependencies from the command line"; + homepage = https://github.com/killercup/cargo-edit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gerschtli jb55 ]; + platforms = platforms.all; + }; + }; }; } From 5e445b94f8327871987b9cca3e1dc7d32d33eae0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 May 2018 15:31:40 +0200 Subject: [PATCH 063/153] androidStudioPackages.{dev,canary}: 3.2.0.14 -> 3.2.0.15 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ecc6e244a585..339a1ce7c6f1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.14"; # "Android Studio 3.2 Canary 15" - build = "181.4773949"; - sha256Hash = "10lhy6sdvvh4a8kj8jyk4z9nzh67v8f5zpkwparvk3pb2s5mf3mk"; + version = "3.2.0.15"; # "Android Studio 3.2 Canary 16" + build = "181.4802120"; + sha256Hash = "0ch9jjq58k83dpnq65xyxchyik24w3fmh2v9q3kx1s028iavmpym"; }; in rec { # Old alias From cf5a5b82d4e42ae8b178fe2da4fcf2b6a3e4883b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 May 2018 15:37:05 +0200 Subject: [PATCH 064/153] pythonPackages.raven: 6.8.0 -> 6.9.0 --- pkgs/development/python-modules/raven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 9ec3f7c156ed..07632662d267 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "raven"; - version = "6.8.0"; + version = "6.9.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "raven-python"; rev = version; - sha256 = "0d052nns0pf1bsazapnnrylvair37vhnjaifsdldddqv05ccfc57"; + sha256 = "1kggp34i8gqi47khca2v5n2i32zrg66m1pga6c00yqmlbv74d84v"; }; # way too many dependencies to run tests From 87a68c455e7a5475e2a899a6f956da521afec715 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 15:49:51 +0200 Subject: [PATCH 065/153] kernel: Allow kernel packages to specify a custom default defconfig --- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 2b44ff51ad0a..249a1ea5cefa 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -12,6 +12,9 @@ , # The kernel version. version +, # Allows overriding the default defconfig + defconfig ? null + , # Overrides to the kernel config. extraConfig ? "" @@ -85,7 +88,7 @@ let platformName = hostPlatform.platform.name; # e.g. "defconfig" - kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; + kernelBaseConfig = if defconfig != null then defconfig else hostPlatform.platform.kernelBaseConfig; # e.g. "bzImage" kernelTarget = hostPlatform.platform.kernelTarget; From 96edbe4a0eaf192d970172351a685c9b5585a7ce Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Nov 2017 15:50:19 +0200 Subject: [PATCH 066/153] linux_rpi: Specify defconfig in kernel expression In particular, now the mainline kernel can be built on the RPi 1 as well (so kernelBaseConfig should always be a mainline defconfig from now on). And RPi 2 users can now use linux_rpi without doing the `nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;` dance. --- lib/systems/platforms.nix | 4 +--- pkgs/os-specific/linux/kernel/linux-rpi.nix | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 32f055b6b1c5..00b2b683db0d 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -167,7 +167,7 @@ rec { raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelBaseConfig = "bcmrpi_defconfig"; + kernelBaseConfig = "bcm2835_defconfig"; kernelDTB = true; kernelArch = "arm"; kernelAutoModules = false; @@ -254,8 +254,6 @@ rec { raspberrypi2 = armv7l-hf-multiplatform // { name = "raspberrypi2"; - kernelBaseConfig = "bcm2709_defconfig"; - kernelDTB = true; kernelAutoModules = false; kernelExtraConfig = '' BLK_DEV_RAM y diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index a96a910c68c9..d85583242213 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -15,6 +15,11 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; }; + defconfig = { + "armv6l-linux" = "bcmrpi_defconfig"; + "armv7l-linux" = "bcm2709_defconfig"; + }.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'"); + features = { efiBootStub = false; } // (args.features or {}); From db2988f7bd579b984d98fbdbcbc157b9eb9fd387 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 19:32:19 +0200 Subject: [PATCH 067/153] platforms.nix: Clean up obsolete cruft from raspberrypi Works fine without, and the 'DRM n' is actually preventing the mainline VC4 driver from building. --- lib/systems/platforms.nix | 69 --------------------------------------- 1 file changed, 69 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 00b2b683db0d..ccfad9543e3b 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -172,83 +172,14 @@ rec { kernelArch = "arm"; kernelAutoModules = false; kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - # Disable OABI to have seccomp_filter (required for systemd) # https://github.com/raspberrypi/firmware/issues/651 OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y ''; kernelTarget = "zImage"; gcc = { arch = "armv6"; fpu = "vfp"; - # TODO(@Ericson2314) what is this and is it a good idea? It was - # used in some cross compilation examples but not others. - # - # abi = "aapcs-linux"; }; }; From 3abdd4f1e3d85bd258caa92baf42b30286109d10 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 19:34:00 +0200 Subject: [PATCH 068/153] platforms.nix: Clean up obsolete cruft from raspberrypi2 --- lib/systems/platforms.nix | 77 ++------------------------------------- 1 file changed, 4 insertions(+), 73 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index ccfad9543e3b..14a0c4eb6967 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -186,79 +186,6 @@ rec { raspberrypi2 = armv7l-hf-multiplatform // { name = "raspberrypi2"; kernelAutoModules = false; - kernelExtraConfig = '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Disable the common config Xen, it doesn't build on ARM - XEN? n - ''; kernelTarget = "zImage"; }; @@ -353,6 +280,10 @@ rec { # Hangs ODROID-XU4 ARM_BIG_LITTLE_CPUIDLE n + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n ''; gcc = { # Some table about fpu flags: From 27bb4da3441eed128574e5e4eabf5762fe4f68be Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 6 Nov 2017 15:26:52 +0200 Subject: [PATCH 069/153] platforms.nix: More rpi2 cleanup --- lib/systems/platforms.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 14a0c4eb6967..f624a5c140a3 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -183,11 +183,8 @@ rec { }; }; - raspberrypi2 = armv7l-hf-multiplatform // { - name = "raspberrypi2"; - kernelAutoModules = false; - kernelTarget = "zImage"; - }; + # Legacy attribute, for compatibility with existing configs only. + raspberrypi2 = armv7l-hf-multiplatform; scaleway-c1 = armv7l-hf-multiplatform // { gcc = { From 37b90ed9af899b118758199b2e9b24b9570a30c0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 31 May 2018 17:55:23 +0200 Subject: [PATCH 070/153] scdoc: init at 1.3.3 (#41315) We'll need this to build the man pages of sway 1.0 (sway 1.0-alpha.2: "This release replaces the asciidoc dependency with scdoc." [0]). [0]: https://github.com/swaywm/sway/releases/tag/1.0-alpha.2 --- pkgs/tools/typesetting/scdoc/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/typesetting/scdoc/default.nix diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix new file mode 100644 index 000000000000..b3c256e94869 --- /dev/null +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "scdoc-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; + sha256 = "1xkfsrzpbm68522b1dml9dghnwb5dlwpf91c1i4y51rgv3hdgwdj"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "VERSION=1.2.3" "VERSION=${version}" \ + --replace "-static" "" \ + --replace "/usr/local" "$out" + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A simple man page generator"; + longDescription = '' + scdoc is a simple man page generator written for POSIX systems written in + C99. + ''; + homepage = https://git.sr.ht/~sircmpwn/scdoc/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a43f084b56a7..b092b5113283 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4853,6 +4853,8 @@ with pkgs; scanbd = callPackage ../tools/graphics/scanbd { }; + scdoc = callPackage ../tools/typesetting/scdoc { }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; From e8b7d73653259942a44e52c18a594154993477e3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:08 -0400 Subject: [PATCH 071/153] Revert "inkscape: disable parallelBuilding" This reverts commit 05a6e94f3437af6c28fa8b794136e193553e98c5. --- pkgs/applications/graphics/inkscape/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ae3de3494122..42257323eac6 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { libvisio libcdr libexif potrace python2Env icu ]; - # To avoid non-deterministic build failure using make. - # When switching back to cmake turn parallel back on, see #40046. - enableParallelBuilding = false; + enableParallelBuilding = true; preConfigure = '' intltoolize -f From 63c0885502952375fe8e323a3c043c00ccea55d2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:19 -0400 Subject: [PATCH 072/153] Revert "inkscape: fix on darwin again" This reverts commit 047c9372ab1314d8e3fab13b9f21359fdf3a643c. --- pkgs/applications/graphics/inkscape/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 42257323eac6..1ddddc65b213 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,13 +29,10 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: - ${lib.optionalString (!stdenv.isDarwin) '' - patchShebangs share/filters - patchShebangs share/palettes - patchShebangs share/patterns - patchShebangs share/symbols - patchShebangs share/templates - ''} + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. From 4a58ed605942e2a135cc18e9396358abe99624b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:21 -0400 Subject: [PATCH 073/153] Revert "inkscape: don't patch share/filters" This reverts commit 38364c0b07b9343e67e331bdcad1891511690c0b. --- pkgs/applications/graphics/inkscape/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 1ddddc65b213..ff53e5f11606 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: + patchShebangs share/filters patchShebangs share/palettes patchShebangs share/patterns patchShebangs share/symbols From 9e04546809f7a8ab176ae6aded2c0ca6ee1611d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:23 -0400 Subject: [PATCH 074/153] Revert "inkscape: Fix build on NixOS" This reverts commit 6c748ae749faae3ff989a800ffa5095f634a6050. --- pkgs/applications/graphics/inkscape/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ff53e5f11606..8f6c096847fb 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,7 +4,6 @@ , gsl, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, autoreconfHook , intltool -, icu # Not needed for building with CMake , lib }: @@ -28,13 +27,6 @@ stdenv.mkDerivation rec { patchShebangs share/extensions patchShebangs fix-roff-punct - # XXX: Not needed for CMake: - patchShebangs share/filters - patchShebangs share/palettes - patchShebangs share/patterns - patchShebangs share/symbols - patchShebangs share/templates - # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ @@ -46,7 +38,7 @@ stdenv.mkDerivation rec { perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace python2Env icu + libvisio libcdr libexif potrace python2Env ]; enableParallelBuilding = true; From 012a3a3f9b2672e3bb10fc88fb5b2df092aecb9d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:25 -0400 Subject: [PATCH 075/153] Revert "inkscape: typo" This reverts commit 0a8c91a931ea270e8b1d66f592f6acba9b4b5fcf. --- pkgs/applications/graphics/inkscape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 8f6c096847fb..89b2a1f171aa 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = with maintainters; [ matthewbauer ]; }; } From 95f917153154ef8ff4bb408ef350675f1b08e89b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 15:10:27 -0400 Subject: [PATCH 076/153] Revert "inkscape: fix on Darwin" This reverts commit a276d5160cc4b307d97261b419e183fb3a2214aa. --- .../graphics/inkscape/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 89b2a1f171aa..7eb9e7aa0016 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,15 +2,9 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, autoreconfHook -, intltool -, lib +, libvisio, libcdr, libexif, potrace, cmake }: -# Note that originally this Nix expression used CMake to build but -# this led to errors on MacOS of "Too many arguments". Inkscape -# supports autoconf and we will use this for now on. - let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); in @@ -23,6 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; + unpackPhase = '' + cp $src ${name}.tar.bz2 + tar xvjf ${name}.tar.bz2 > /dev/null + cd ${name} + ''; + postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct @@ -33,29 +33,28 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig autoreconfHook intltool ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace python2Env + libvisio libcdr libexif potrace cmake python2Env ]; enableParallelBuilding = true; - preConfigure = '' - intltoolize -f - ''; - postInstall = '' # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape + install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; # 0.92.3 complains about an invalid conversion from const char * to char * NIX_CFLAGS_COMPILE = " -fpermissive "; - meta = with lib; { + meta = with stdenv.lib; { license = "GPL"; homepage = https://www.inkscape.org; description = "Vector graphics editor"; @@ -66,6 +65,5 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; - maintainers = with maintainters; [ matthewbauer ]; }; } From 279fd72b339a88aac56b425bdd3dbdc6ba3f7c1c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 May 2018 15:55:19 -0400 Subject: [PATCH 077/153] darwin.ICU: fix cctools --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 3120d8ae3d10..f9602b50e321 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -212,7 +212,11 @@ let dtrace-xcode = applePackage "dtrace/xcode.nix" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; - ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; + + # Splicing is currently broken in Nixpkgs + # cctools need to be specified manually here to handle this + ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; }; + IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; From 9a4cb9003e32fdb1e07e044a7ee9b96bbebfa899 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 May 2018 21:19:45 -0400 Subject: [PATCH 078/153] wesnoth: supports darwin --- pkgs/games/wesnoth/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index a30685338b00..12fb0bd60b0b 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu +, Cocoa, Foundation , enableTools ? false }: @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre openssl icu ]; + libvorbis fribidi dbus libpng pcre openssl icu ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; @@ -36,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b092b5113283..893e74248f6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19618,7 +19618,9 @@ with pkgs; warzone2100 = libsForQt5.callPackage ../games/warzone2100 { }; - wesnoth = callPackage ../games/wesnoth { }; + wesnoth = callPackage ../games/wesnoth { + inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; + }; wesnoth-dev = wesnoth; From 0e0435615396562c855bf8f1a949a077b60cdc2a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 May 2018 21:20:56 -0400 Subject: [PATCH 079/153] woff2: supports darwin --- pkgs/development/web/woff2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index 1142c1e006b7..bda6dab14d8a 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/google/woff2; license = licenses.mit; maintainers = [ maintainers.hrdinka ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 8950b14355b93d25cf71b3df74f8b4e7ecc93223 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 May 2018 21:21:09 -0400 Subject: [PATCH 080/153] libpeas: supports darwin --- pkgs/desktops/gnome-3/core/libpeas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 8eaa927ac7b9..d4ca0e509ddd 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A GObject-based plugins engine"; homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } From 58359bab6bf5478e65042c80b501bd5f48351cdc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 May 2018 21:35:38 -0400 Subject: [PATCH 081/153] all-packages: remove default.nix in callPackage not needed --- pkgs/top-level/all-packages.nix | 118 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 893e74248f6b..7ececf584e3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -142,7 +142,7 @@ with pkgs; dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; - dotnet-sdk = callPackage ../development/compilers/dotnet/sdk/default.nix { }; + dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { }; dispad = callPackage ../tools/X11/dispad { }; @@ -358,13 +358,13 @@ with pkgs; replaceDependency = callPackage ../build-support/replace-dependency.nix { }; - nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; + nukeReferences = callPackage ../build-support/nuke-references { }; - removeReferencesTo = callPackage ../build-support/remove-references-to/default.nix { }; + removeReferencesTo = callPackage ../build-support/remove-references-to { }; - vmTools = callPackage ../build-support/vm/default.nix { }; + vmTools = callPackage ../build-support/vm { }; - releaseTools = callPackage ../build-support/release/default.nix { }; + releaseTools = callPackage ../build-support/release { }; composableDerivation = callPackage ../../lib/composable-derivation.nix { }; @@ -458,7 +458,7 @@ with pkgs; stdenv = clangStdenv; }; - afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; + afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; agrep = callPackage ../tools/text/agrep { }; @@ -653,7 +653,7 @@ with pkgs; git-fire = callPackage ../tools/misc/git-fire { }; - gitless = callPackage ../applications/version-management/gitless/default.nix { }; + gitless = callPackage ../applications/version-management/gitless { }; grc = callPackage ../tools/misc/grc { }; @@ -911,7 +911,7 @@ with pkgs; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; + btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {}; btrbk = callPackage ../tools/backup/btrbk { asciidoc = asciidoc-full; @@ -2148,7 +2148,7 @@ with pkgs; s-tar = callPackages ../tools/archivers/s-tar {}; - tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + tealdeer = callPackage ../tools/misc/tealdeer { }; uudeview = callPackage ../tools/misc/uudeview { }; @@ -2313,7 +2313,7 @@ with pkgs; fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - fcppt = callPackage ../development/libraries/fcppt/default.nix { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -2417,7 +2417,7 @@ with pkgs; fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox/default.nix { + fox = callPackage ../development/libraries/fox { libpng = libpng12; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -3036,7 +3036,7 @@ with pkgs; iftop = callPackage ../tools/networking/iftop { }; - ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + ifuse = callPackage ../tools/filesystems/ifuse { }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages_38.libcxxStdenv; @@ -3750,7 +3750,7 @@ with pkgs; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe/default.nix { + mednaffe = callPackage ../misc/emulators/mednaffe { gtk2 = null; }; @@ -3758,9 +3758,9 @@ with pkgs; megatools = callPackage ../tools/networking/megatools { }; - memo = callPackage ../applications/misc/memo/default.nix { }; + memo = callPackage ../applications/misc/memo { }; - mencal = callPackage ../applications/misc/mencal/default.nix { } ; + mencal = callPackage ../applications/misc/mencal { } ; metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; @@ -5362,7 +5362,7 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; - twilight = callPackage ../tools/graphics/twilight/default.nix { + twilight = callPackage ../tools/graphics/twilight { libX11 = xorg.libX11; }; @@ -6439,7 +6439,7 @@ with pkgs; stack = haskell.lib.justStaticExecutables haskellPackages.stack; hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; - all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; + all-cabal-hashes = callPackage ../data/misc/hackage { }; purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; psc-package = haskell.lib.justStaticExecutables @@ -6535,7 +6535,7 @@ with pkgs; intercal = callPackage ../development/compilers/intercal { }; - irony-server = callPackage ../development/tools/irony-server/default.nix { + irony-server = callPackage ../development/tools/irony-server { # The repository of irony to use -- must match the version of the employed emacs # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other @@ -6887,7 +6887,7 @@ with pkgs; rgbds = callPackage ../development/compilers/rgbds { }; - rtags = callPackage ../development/tools/rtags/default.nix { + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; @@ -7961,7 +7961,7 @@ with pkgs; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { }; - flex = callPackage ../development/tools/parsing/flex/default.nix { }; + flex = callPackage ../development/tools/parsing/flex { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; @@ -9201,7 +9201,7 @@ with pkgs; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp - mpfr = callPackage ../development/libraries/mpfr/default.nix { }; + mpfr = callPackage ../development/libraries/mpfr { }; mpfi = callPackage ../development/libraries/mpfi { }; @@ -9535,7 +9535,7 @@ with pkgs; libpng = libpng12; }; - imv = callPackage ../applications/graphics/imv/default.nix { }; + imv = callPackage ../applications/graphics/imv { }; iml = callPackage ../development/libraries/iml { }; @@ -10492,7 +10492,7 @@ with pkgs; libunibreak = callPackage ../development/libraries/libunibreak { }; - libunique = callPackage ../development/libraries/libunique/default.nix { }; + libunique = callPackage ../development/libraries/libunique { }; libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; }; liburcu = callPackage ../development/libraries/liburcu { }; @@ -11009,7 +11009,7 @@ with pkgs; ortp = callPackage ../development/libraries/ortp { }; - openrct2 = callPackage ../games/openrct2/default.nix { }; + openrct2 = callPackage ../games/openrct2 { }; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; @@ -11966,14 +11966,14 @@ with pkgs; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix { + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix { + wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; @@ -12369,7 +12369,7 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; + archiveopteryx = callPackage ../servers/mail/archiveopteryx { }; atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; @@ -12467,7 +12467,7 @@ with pkgs; exhibitor = callPackage ../servers/exhibitor { }; - hyp = callPackage ../servers/http/hyp/default.nix { }; + hyp = callPackage ../servers/http/hyp { }; prosody = callPackage ../servers/xmpp/prosody { # _compat can probably be removed on next minor version after 0.10.0 @@ -12562,11 +12562,11 @@ with pkgs; mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca/default.nix { }; + meguca = callPackage ../servers/meguca { }; memcached = callPackage ../servers/memcached {}; - meteor = callPackage ../servers/meteor/default.nix { }; + meteor = callPackage ../servers/meteor { }; minio = callPackage ../servers/minio { }; @@ -12804,12 +12804,12 @@ with pkgs; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; - pgbouncer = callPackage ../servers/sql/pgbouncer/default.nix { }; + pgbouncer = callPackage ../servers/sql/pgbouncer { }; pgpool93 = pgpool.override { postgresql = postgresql93; }; pgpool94 = pgpool.override { postgresql = postgresql94; }; - pgpool = callPackage ../servers/sql/pgpool/default.nix { + pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream }; @@ -12878,7 +12878,7 @@ with pkgs; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; - radicale2 = callPackage ../servers/radicale/default.nix { }; + radicale2 = callPackage ../servers/radicale { }; radicale = radicale2; @@ -13053,7 +13053,7 @@ with pkgs; inherit (darwin.apple_sdk.libs) Xplugin; }; - xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { + xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook @@ -13588,7 +13588,7 @@ with pkgs; lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; - broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; tbs = callPackage ../os-specific/linux/tbs { }; @@ -14155,7 +14155,7 @@ with pkgs; eudev = callPackage ../os-specific/linux/eudev {}; - libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; + libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; @@ -14786,7 +14786,7 @@ with pkgs; useUnrar = config.ahoviewer.useUnrar or false; }; - airwave = callPackage ../applications/audio/airwave/default.nix { }; + airwave = callPackage ../applications/audio/airwave { }; alembic = callPackage ../development/libraries/alembic {}; @@ -15622,7 +15622,7 @@ with pkgs; epdfview = callPackage ../applications/misc/epdfview { }; - epeg = callPackage ../applications/graphics/epeg/default.nix { }; + epeg = callPackage ../applications/graphics/epeg { }; inherit (gnome3) epiphany; @@ -15739,7 +15739,7 @@ with pkgs; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; - gitweb = callPackage ../applications/version-management/git-and-tools/gitweb/default.nix { }; + gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; gksu = callPackage ../applications/misc/gksu { }; @@ -16318,7 +16318,7 @@ with pkgs; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; - i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; i3minator = callPackage ../tools/misc/i3minator { }; @@ -16446,9 +16446,9 @@ with pkgs; bip = callPackage ../applications/networking/irc/bip { }; - j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop/default.nix { }; + j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; - jabref = callPackage ../applications/office/jabref/default.nix { }; + jabref = callPackage ../applications/office/jabref { }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -17469,7 +17469,7 @@ with pkgs; psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; - psol = callPackage ../development/libraries/psol/default.nix { }; + psol = callPackage ../development/libraries/psol { }; pstree = callPackage ../applications/misc/pstree { }; @@ -17964,7 +17964,7 @@ with pkgs; ltunify = callPackage ../tools/misc/ltunify { }; - src = callPackage ../applications/version-management/src/default.nix { + src = callPackage ../applications/version-management/src { git = gitMinimal; }; @@ -17995,7 +17995,7 @@ with pkgs; sublime3-dev = sublime3Packages.sublime3-dev; - inherit (callPackages ../applications/version-management/subversion/default.nix { + inherit (callPackages ../applications/version-management/subversion { bdbSupport = true; httpServer = false; httpSupport = true; @@ -18672,7 +18672,7 @@ with pkgs; xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbindkeys-config = callPackage ../tools/X11/xbindkeys-config/default.nix { + xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { gtk = gtk2; }; @@ -19529,7 +19529,7 @@ with pkgs; tennix = callPackage ../games/tennix { }; - terraria-server = callPackage ../games/terraria-server/default.nix { }; + terraria-server = callPackage ../games/terraria-server { }; tibia = callPackage_i686 ../games/tibia { }; @@ -19565,7 +19565,7 @@ with pkgs; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx/default.nix { + ultrastardx = callPackage ../games/ultrastardx { ffmpeg = ffmpeg_2; }; @@ -19874,7 +19874,7 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; - bedtools = callPackage ../applications/science/biology/bedtools/default.nix { }; + bedtools = callPackage ../applications/science/biology/bedtools { }; bcftools = callPackage ../applications/science/biology/bcftools { }; @@ -19906,7 +19906,7 @@ with pkgs; kallisto = callPackage ../applications/science/biology/kallisto { }; - muscle = callPackage ../applications/science/biology/muscle/default.nix { }; + muscle = callPackage ../applications/science/biology/muscle { }; n3 = callPackage ../applications/science/biology/N3 { inherit (perlPackages) perl GetoptTabular MNI-Perllib; @@ -19942,13 +19942,13 @@ with pkgs; paml = callPackage ../applications/science/biology/paml { }; - picard-tools = callPackage ../applications/science/biology/picard-tools/default.nix { }; + picard-tools = callPackage ../applications/science/biology/picard-tools { }; - platypus = callPackage ../applications/science/biology/platypus/default.nix { }; + platypus = callPackage ../applications/science/biology/platypus { }; - plink = callPackage ../applications/science/biology/plink/default.nix { }; + plink = callPackage ../applications/science/biology/plink { }; - plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; + plink-ng = callPackage ../applications/science/biology/plink-ng { }; raxml = callPackage ../applications/science/biology/raxml { }; @@ -19956,18 +19956,18 @@ with pkgs; mpi = true; }); - samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + samtools = callPackage ../applications/science/biology/samtools { }; samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { stdenv = gccStdenv; }; - snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; + snpeff = callPackage ../applications/science/biology/snpeff { }; star = callPackage ../applications/science/biology/star { }; - varscan = callPackage ../applications/science/biology/varscan/default.nix { }; + varscan = callPackage ../applications/science/biology/varscan { }; - bwa = callPackage ../applications/science/biology/bwa/default.nix { }; + bwa = callPackage ../applications/science/biology/bwa { }; ### SCIENCE/MACHINE LEARNING @@ -20252,7 +20252,7 @@ with pkgs; picosat = callPackage ../applications/science/logic/picosat {}; - libpoly = callPackage ../applications/science/logic/poly/default.nix {}; + libpoly = callPackage ../applications/science/logic/poly {}; prooftree = (with ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { From ced1670092402319ad3260d82b41bd5306a3c266 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 17:16:58 -0400 Subject: [PATCH 082/153] haskell: disable language-nix on i686 linux see https://github.com/peti/language-nix/issues/4 for discusssion --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a88cd1c789ed..387983003af3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -347,6 +347,7 @@ self: super: { itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; + language-nix = overrideCabal super.language-nix (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); # Tests crash on 32-bit linux; see https://github.com/peti/language-nix/issues/4 ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 From 753c63dbc11bbd8a090a953acb8f9669f7f0ecf0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 17:53:54 -0400 Subject: [PATCH 083/153] qemu-flags: default to qemu-kvm this is the "generic" version & should work everywhere. also add darwin case --- nixos/lib/qemu-flags.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index e4c95ebdfb0d..6f61c64a832e 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -13,9 +13,9 @@ else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { - "i686-linux" = "${qemuPkg}/bin/qemu-kvm"; "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'"); + "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + }.${pkgs.stdenv.system} or "${qemuPkg}/bin/qemu-kvm"; } From ee1d6114a8926b96651e1938ad8dd6464db84339 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 21:39:14 -0400 Subject: [PATCH 084/153] emacsMacport: 25.3 -> 26.1 --- pkgs/applications/editors/emacs/macport.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 70c723b40dae..c5cb0f4655e6 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,26 +4,26 @@ }: stdenv.mkDerivation rec { - emacsVersion = "25.3"; + emacsVersion = "26.1"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "6.8"; + macportVersion = "7.0"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; src = fetchurl { - url = "mirror:///gnu/emacs/${emacsName}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + url = "mirror://gnu/emacs/${emacsName}.tar.xz"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg"; + sha256 = "02dbasiv1szvlzi0avb7bi9xwpw2lssj3kzbn8pi5vmziqhvgfhz"; }; hiresSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-2.0.tar.gz"; - sha256 = "1ari8n3y1d4hdl9npg3c3hk27x7cfkwfgyhgzn1vlqkrdah4z434"; + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-3.0.tar.gz"; + sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk"; }; enableParallelBuilding = true; From 2f68e86ce6b6018828bb52098c72aa464d9120ca Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 22:27:24 -0400 Subject: [PATCH 085/153] zsh: only do promptInit when TERM!=dumb This allows tramp to be used correctly when default shell is zsh. --- nixos/modules/programs/zsh/zsh.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index f689250dc61f..662b463d572e 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -69,7 +69,9 @@ in promptInit = mkOption { default = '' - autoload -U promptinit && promptinit && prompt walters + if [ "$TERM" != dumb ]; then + autoload -U promptinit && promptinit && prompt walters + fi ''; description = '' Shell script code used to initialise the zsh prompt. From f492246df2f21ebb281716c76153fb271e456811 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 22:36:26 -0400 Subject: [PATCH 086/153] all-packages remove unused override --- 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 7ececf584e3b..3b02a62f7f26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19077,7 +19077,7 @@ with pkgs; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); - dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; + dwarf-fortress = dwarf-fortress-packages.dwarf-fortress; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; From e557a432e07441a508544fca2aba3be6fd9860c0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 30 May 2018 23:06:28 -0400 Subject: [PATCH 087/153] cairo: fix build inputs --- pkgs/development/libraries/cairo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 74ae4abaedf9..7f6419272dd9 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -25,6 +25,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig + ]; + + buildInputs = [ libiconv libintl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 03b3148beb975645b762bfd9f6961d967a926a5e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 11:11:27 -0400 Subject: [PATCH 088/153] ffmpeg: fix 3.4 on darwin --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b02a62f7f26..b9d7ec7c5d4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8920,6 +8920,7 @@ with pkgs; }; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + stdenv = gccStdenv; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; From 85ae7137ac6a1623be90c8f0897566367d300c12 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 11:41:14 -0400 Subject: [PATCH 089/153] Revert commit 4b2f3971981272b79da7f87b639ca8854a6ea89c This reverts commit 4b2f3971981272b79da7f87b639ca8854a6ea89c. It updated gdk_pixbuf to 2.36.12 but unfortunately broke macOS builds. The new mime sniffing is not working correctly so that .png files cannot be built. Fixes #41314 /cc @jtojnar @lnl7 --- .../libraries/gdk-pixbuf/default.nix | 72 +++++-------------- .../gdk-pixbuf/installed-tests-path.patch | 13 ---- .../gdk-pixbuf/no-mime-sniffing.patch | 18 ----- 3 files changed, 18 insertions(+), 85 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch delete mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 849e72d9a976..7660d6481c3c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,72 +4,39 @@ let pname = "gdk-pixbuf"; - version = "2.36.12"; + version = "2.36.7"; + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "${pname}-${version}"; - # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball - # src = fetchurl { - # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; - # }; - src = fetchgit { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git; - rev = version; - sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; - patches = [ - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which requires access to shared-mime-info files during runtime. - # For now, we are patching the build script to avoid the dependency. - ./no-mime-sniffing.patch - - # Fix installed tests with meson - # https://bugzilla.gnome.org/show_bug.cgi?id=795527 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371381; - sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn"; - }) - - # Add missing test file bug753605-atsize.jpg - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch; - sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; - }) - - # Move installed tests to a separate output - ./installed-tests-path.patch - ]; - - outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "devdoc" ]; setupHook = ./setup-hook.sh; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; + enableParallelBuilding = true; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobjectIntrospection makeWrapper - ] + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. + buildInputs = [ libX11 gobjectIntrospection ]; + + nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - mesonFlags = [ - "-Ddocs=true" - "-Djasper=true" - "-Dx11=true" - "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" - ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; - postPatch = '' - chmod +x build-aux/* # patchShebangs only applies to executables - patchShebangs build-aux - - substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" + # on darwin, tests don't link + preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' + substituteInPlace Makefile --replace "docs tests" "docs" ''; postInstall = @@ -77,9 +44,6 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - - # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch library references or binaries. diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch deleted file mode 100644 index 1da2b0a10dcd..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -85,8 +85,8 @@ - 'aero.gif', - ] - --installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) --installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name()) -+installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name()) -+installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name()) - - install_data(test_data, install_dir: installed_test_bindir) - install_subdir('test-images', install_dir: installed_test_bindir) diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch deleted file mode 100644 index 9896e25acda1..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -186,13 +186,8 @@ - gmodule_dep = dependency('gmodule-no-export-2.0') - gio_dep = dependency('gio-2.0') - --# On non-Windows/macOS systems we always required shared-mime-info and GIO --if host_system != 'windows' and host_system != 'darwin' -- shared_mime_dep = dependency('shared-mime-info') -- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) --else -- shared_mime_dep = [] --endif -+# No MIME sniffing for now -+shared_mime_dep = [] - - gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] - From 050557ef8ac21f0458f23a902f0f0229069e937b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:13:03 -0400 Subject: [PATCH 090/153] PowerManagement: init at 572.50.1 --- .../apple-source-releases/PowerManagement/default.nix | 9 +++++++++ .../os-specific/darwin/apple-source-releases/default.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix new file mode 100644 index 000000000000..a866c9414d52 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix @@ -0,0 +1,9 @@ +{ appleDerivation, xcbuild, IOKit }: + +appleDerivation { + buildInputs = [ xcbuild IOKit ]; + xcbuildFlags = "-target caffeinate"; + installPhase = '' + install -D Products/Deployment/caffeinate $out/bin/caffeinate + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index f9602b50e321..e2d62cef1ba4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -7,6 +7,7 @@ let # now it's staying here. versions = { "osx-10.11.6" = { + PowerManagement = "572.50.1"; SmartCardServices = "55111"; dtrace = "168"; xnu = "3248.60.10"; @@ -257,6 +258,7 @@ let system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; text_cmds = applePackage "text_cmds" "osx-10.11.6" "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {}; top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; + PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {}; security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {}; From fd874b74560d5811660b492c38f0a690468d6bef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:13:35 -0400 Subject: [PATCH 091/153] netbsd: allow replacing nbcompat with libbsd --- pkgs/os-specific/bsd/netbsd/compat.patch | 18 ++++++++++++++++++ pkgs/os-specific/bsd/netbsd/default.nix | 9 ++++++++- pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc | 11 +++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/bsd/netbsd/compat.patch create mode 100644 pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc diff --git a/pkgs/os-specific/bsd/netbsd/compat.patch b/pkgs/os-specific/bsd/netbsd/compat.patch new file mode 100644 index 000000000000..f67ca2e50791 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/compat.patch @@ -0,0 +1,18 @@ +diff -u -r1.35.2.1 nbtool_config.h.in +--- a/nbtool_config.h.in 22 Apr 2015 07:18:58 -0000 1.35.2.1 ++++ b/nbtool_config.h.in 31 May 2018 01:46:53 -0000 +@@ -680,5 +680,14 @@ + /* Define if you have u_int8_t, but not uint8_t. */ + #undef uint8_t + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #include "compat_defs.h" ++ ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* !__NETBSD_NBTOOL_CONFIG_H__ */ diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 84d6926c50c7..eb305d5b3db7 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -162,7 +162,7 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = netBSDDerivation { + compat = netBSDDerivation rec { path = "tools/compat"; sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; version = "7.1.2"; @@ -182,6 +182,8 @@ let installFlags = []; RENAME = "-D"; + patches = [ ./compat.patch ]; + postInstall = '' mv $out/include/compat/* $out/include rmdir $out/include/compat @@ -204,6 +206,11 @@ let install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h + mkdir -p $out/lib/pkgconfig + substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ + --subst-var-by out $out \ + --subst-var-by version ${version} + # Remove lingering /usr references if [ -d $out/usr ]; then cd $out/usr diff --git a/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc b/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc new file mode 100644 index 000000000000..3aadabe50882 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc @@ -0,0 +1,11 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: nbcompat +Description: NetBSD compatibility framework +Version: @version@ +URL: https://www.netbsd.org/ +Libs: -L${libdir} -lnbcompat +Cflags: -I${includedir} -DHAVE_NBTOOL_CONFIG_H -include nbtool_config.h From 480434f7eeefed7026dbbd11a4a0b1e4bfc1f137 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:14:21 -0400 Subject: [PATCH 092/153] libbsd: replace with nbcompat --- pkgs/development/libraries/libbsd/cdefs.patch | 222 ------ .../development/libraries/libbsd/darwin.patch | 703 ------------------ pkgs/development/libraries/libbsd/default.nix | 34 - .../libraries/libbsd/features.patch | 26 - .../libraries/libbsd/non-glibc.patch | 74 -- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 2 insertions(+), 1061 deletions(-) delete mode 100644 pkgs/development/libraries/libbsd/cdefs.patch delete mode 100644 pkgs/development/libraries/libbsd/darwin.patch delete mode 100644 pkgs/development/libraries/libbsd/default.nix delete mode 100644 pkgs/development/libraries/libbsd/features.patch delete mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch deleted file mode 100644 index 81822654aeb4..000000000000 --- a/pkgs/development/libraries/libbsd/cdefs.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:41:35 +0100 -Subject: Handle systems missing - -This is a non-portable header, and we cannot expect it to be provided by -the system libc (e.g. musl). We just need and rely on declaration that -we have defined ourselves in our own . So we switch to -only ever assume that. - -Fixes: https://bugs.freedesktop.org/105281 ---- - include/bsd/libutil.h | 4 ++++ - include/bsd/md5.h | 4 ++++ - include/bsd/nlist.h | 4 ++++ - include/bsd/readpassphrase.h | 4 ++++ - include/bsd/stdlib.h | 4 ++++ - include/bsd/string.h | 4 ++++ - include/bsd/stringlist.h | 5 +++++ - include/bsd/sys/queue.h | 4 ++++ - include/bsd/sys/tree.h | 4 ++++ - include/bsd/timeconv.h | 4 ++++ - include/bsd/vis.h | 4 ++++ - include/bsd/wchar.h | 4 ++++ - 12 files changed, 49 insertions(+) - -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..ccca29a 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -40,7 +40,11 @@ - #define LIBBSD_LIBUTIL_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - #include -diff --git a/include/bsd/md5.h b/include/bsd/md5.h -index 5f3ae46..bf36a30 100644 ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -27,7 +27,11 @@ typedef struct MD5Context { - uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } MD5_CTX; - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index cb297e8..8767117 100644 ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -27,7 +27,11 @@ - #ifndef LIBBSD_NLIST_H - #define LIBBSD_NLIST_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - struct nlist { - union { -diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h -index 14744b8..5eb8021 100644 ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -31,7 +31,11 @@ - #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ - #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..8d33d1f 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -42,7 +42,11 @@ - #ifndef LIBBSD_STDLIB_H - #define LIBBSD_STDLIB_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..29097f6 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_STRING_H - #define LIBBSD_STRING_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h -index ff30cac..dd71496 100644 ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -31,7 +31,12 @@ - - #ifndef LIBBSD_STRINGLIST_H - #define LIBBSD_STRINGLIST_H -+ -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - /* -diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h -index 4a94ea7..ac00026 100644 ---- a/include/bsd/sys/queue.h -+++ b/include/bsd/sys/queue.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_SYS_QUEUE_H - #define LIBBSD_SYS_QUEUE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, -diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h -index 628bec0..325b382 100644 ---- a/include/bsd/sys/tree.h -+++ b/include/bsd/sys/tree.h -@@ -30,7 +30,11 @@ - #ifndef LIBBSD_SYS_TREE_H - #define LIBBSD_SYS_TREE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines data structures for different types of trees: -diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h -index e2a2c55..a426bd3 100644 ---- a/include/bsd/timeconv.h -+++ b/include/bsd/timeconv.h -@@ -41,7 +41,11 @@ - #ifndef LIBBSD_TIMECONV_H - #define LIBBSD_TIMECONV_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/vis.h b/include/bsd/vis.h -index 970dfdd..ab5430c 100644 ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -72,7 +72,11 @@ - */ - #define UNVIS_END 1 /* no more characters */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - __BEGIN_DECLS - char *vis(char *, int, int, int); -diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h -index 33a500e..7216503 100644 ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -40,7 +40,11 @@ - #define LIBBSD_WCHAR_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS --- -cgit v1.1 - diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch deleted file mode 100644 index 4bddec6b0ffd..000000000000 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ /dev/null @@ -1,703 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 88ccd91..0857782 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ AS_CASE([$host_os], - ) - - # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE -@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - pstat_getproc sysconf]) - AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - -+HostOS=`echo "$host" | sed 's/.*-//'` -+os_is_macosx=false -+nonLinuxOS=false -+AC_SUBST(HostOS) -+case ${HostOS} in -+ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*) -+ os_is_macosx=true -+ nonLinuxOS=true -+ echo HostOS="$HostOS" -+ ;; -+ *) -+ echo host="$host" -+ echo HostOS="$HostOS" -+ os_is_macosx=false -+ nonLinuxOS=false -+ ;; -+esac -+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) -+AM_COND_IF([IS_DARWIN], -+ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])]) -+ -+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue]) -+AM_COND_IF([NON_LINUX], -+ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])]) -+ - AC_CONFIG_FILES([ - Makefile - include/Makefile -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..d0d4043 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -39,7 +39,9 @@ - #ifndef LIBBSD_LIBUTIL_H - #define LIBBSD_LIBUTIL_H - -+#ifdef HAVE_FEATURES_H - #include -+#endif - #include - #include - #include -diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 4b69983..c75151b 100644 ---- a/include/bsd/stdio.h -+++ b/include/bsd/stdio.h -@@ -48,12 +48,16 @@ - __BEGIN_DECLS - const char *fmtcheck(const char *, const char *); - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - /* XXX: The function requires cooperation from the system libc to store the - * line buffer in the FILE struct itself. */ - char *fgetln(FILE *fp, size_t *lenp) -- LIBBSD_DEPRECATED("This functions cannot be safely ported, " -- "use getline(3) instead, as it is supported " -- "by GNU and POSIX.1-2008."); -+ __attribute__((deprecated("This functions cannot be safely ported, " -+ "use getline(3) instead, as it is supported " -+ "by GNU and POSIX.1-2008."))); -+#else -+char *fgetln(FILE *fp, size_t *lenp); -+#endif - - /* - * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..6cd7943 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) -+#if !__GLIBC_PREREQ(2, 26) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif -+#endif - - long long strtonum(const char *nptr, long long minval, long long maxval, - const char **errstr); -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..6baaa14 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -37,6 +37,12 @@ - #include - - __BEGIN_DECLS -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+size_t bsd_strlcpy(char *dst, const char *src, size_t siz); -+size_t bsd_strlcat(char *dst, const char *src, size_t siz); -+char *bsd_strnstr(const char *str, const char *find, size_t str_len); -+void bsd_strmode(mode_t mode, char *str); -+#else - size_t strlcpy(char *dst, const char *src, size_t siz); - size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); -@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); - #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) - void explicit_bzero(void *buf, size_t len); - #endif -+#endif - __END_DECLS - - #endif -diff --git a/src/Makefile.am b/src/Makefile.am -index ad83dbf..0f2a7ee 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \ - libbsd.map - libbsd_la_LIBADD = \ - $(CLOCK_GETTIME_LIBS) -+ -+if IS_DARWIN -+libbsd_la_LDFLAGS = \ -+ -Wl \ -+ -version-number $(LIBBSD_ABI) -+else - libbsd_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libbsd.map \ - -version-number $(LIBBSD_ABI) -+endif -+ - libbsd_la_SOURCES = \ - arc4random.c \ -- arc4random.h \ -- arc4random_unix.h \ -- arc4random_openbsd.h \ - arc4random_uniform.c \ - bsd_getopt.c \ -- chacha_private.h \ - closefrom.c \ - dehumanize_number.c \ - err.c \ -@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \ - $(nil) - endif - -+noinst_HEADERS = \ -+ arc4random.h \ -+ arc4random_bsd.h \ -+ arc4random_linux.h \ -+ arc4random_unix.h \ -+ arc4random_osx.h \ -+ arc4random_openbsd.h \ -+ chacha_private.h -+ - libbsd_ctor_a_SOURCES = \ - setproctitle_ctor.c \ - $(nil) -diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h -new file mode 100644 -index 0000000..ece2f85 ---- /dev/null -+++ b/src/arc4random_bsd.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+/* -+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if -+ * a program does not link to -lthr. Callbacks registered with pthread_atfork() -+ * appear to fail silently. So, it is not always possible to detect a PID -+ * wraparound. -+ */ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h -new file mode 100644 -index 0000000..d61a8db ---- /dev/null -+++ b/src/arc4random_linux.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#ifdef __GLIBC__ -+extern void *__dso_handle; -+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); -+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) -+#else -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+#endif -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h -new file mode 100644 -index 0000000..14771a6 ---- /dev/null -+++ b/src/arc4random_osx.h -@@ -0,0 +1,82 @@ -+/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ *rsp = NULL; -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/fgetln.c b/src/fgetln.c -index 4d1726e..9c73788 100644 ---- a/src/fgetln.c -+++ b/src/fgetln.c -@@ -30,7 +30,9 @@ - #include - #include - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - #include "local-link.h" -+#endif - - #ifdef HAVE_GETLINE - struct filebuf { -@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len) - return fb->buf; - } - } -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - libbsd_link_warning(fgetln, - "This functions cannot be safely ported, use getline(3) " - "instead, as it is supported by GNU and POSIX.1-2008.") -+#endif - #else - #error "Function fgetln() needs to be ported." - #endif -diff --git a/src/fpurge.c b/src/fpurge.c -index 462535a..e7eb46f 100644 ---- a/src/fpurge.c -+++ b/src/fpurge.c -@@ -26,9 +26,11 @@ - - #include - #include -+#if HAVE___FPURGE - #include -+#endif - --#ifdef HAVE___FPURGE -+#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ - int - fpurge(FILE *fp) - { -@@ -42,5 +44,55 @@ fpurge(FILE *fp) - return 0; - } - #else --#error "Function fpurge() needs to be ported." -+#define fp_ fp -+//#error "Function fpurge() needs to be ported." -+//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ -+int -+fpurge(FILE *fp) -+{ -+ if (fp == NULL || fileno(fp) < 0) { -+ errno = EBADF; -+ return EOF; -+ } -+ -+ /* Call the system's fpurge function. */ -+# undef fpurge -+# if !HAVE_DECL_FPURGE -+ extern int fpurge (FILE *); -+# endif -+ int result = fpurge (fp); -+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -+ if (result == 0) -+ /* Correct the invariants that fpurge broke. -+ on BSD systems says: -+ "The following always hold: if _flags & __SRD, _w is 0." -+ If this invariant is not fulfilled and the stream is read-write but -+ currently reading, subsequent putc or fputc calls will write directly -+ into the buffer, although they shouldn't be allowed to. */ -+ if ((fp_->_flags & __SRD) != 0) -+ fp_->_w = 0; -+#endif -+ return result; -+} -+//#endif -+#endif -+ -+#ifdef TEST -+int -+main() -+{ -+ static FILE fp_bad; -+ FILE *fp; -+ -+ if (fpurge(&fp_bad) == 0) -+ return 1; -+ -+ fp = fopen("/dev/zero", "r"); -+ if (fpurge(fp) < 0) -+ return 1; -+ -+ fclose(fp); -+ -+ return 0; -+} - #endif -diff --git a/src/funopen.c b/src/funopen.c -index 1e05c7e..75e61ea 100644 ---- a/src/funopen.c -+++ b/src/funopen.c -@@ -143,6 +143,7 @@ funopen(const void *cookie, - * they will not add the needed support to implement it. Just ignore this - * interface there, as it has never been provided anyway. - */ -+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) - #else - #error "Function funopen() needs to be ported or disabled." - #endif -diff --git a/src/getentropy.c b/src/getentropy.c -index 3f11a1e..8a23a07 100644 ---- a/src/getentropy.c -+++ b/src/getentropy.c -@@ -28,9 +28,7 @@ - #include "getentropy_linux.c" - #elif defined(__GNU__) - #include "getentropy_hurd.c" --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) --#include "getentropy_bsd.c" --#elif defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - #include "getentropy_bsd.c" - #elif defined(__sun) - #include "getentropy_solaris.c" -diff --git a/src/hash/sha512.h b/src/hash/sha512.h -index 4f368a1..ab22fc1 100644 ---- a/src/hash/sha512.h -+++ b/src/hash/sha512.h -@@ -29,7 +29,11 @@ - #ifndef _SHA512_H_ - #define _SHA512_H_ - -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+#include -+#else - #include -+#endif - - #define SHA512_DIGEST_LENGTH 64 - -diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c -index b3c8d5e..f69013d 100644 ---- a/src/hash/sha512c.c -+++ b/src/hash/sha512c.c -@@ -25,7 +25,13 @@ - */ - - #include -+__FBSDID("$FreeBSD$"); -+ -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+#include -+#else - #include -+#endif - #include - - #include -diff --git a/src/nlist.c b/src/nlist.c -index 0932f59..598a329 100644 ---- a/src/nlist.c -+++ b/src/nlist.c -@@ -27,6 +27,10 @@ - * SUCH DAMAGE. - */ - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) -+#if defined(LIBC_SCCS) && !defined(lint) -+static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; -+#endif /* LIBC_SCCS and not lint */ - #include - - #include -@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) - (void)close(fd); - return (n); - } -+#endif /* _NLIST_DO_ELF */ -diff --git a/src/setproctitle.c b/src/setproctitle.c -index 038ac7d..d0ef01b 100644 ---- a/src/setproctitle.c -+++ b/src/setproctitle.c -@@ -32,6 +32,11 @@ - #include - #include - -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+#define __asm__(x) -+extern char **environ; -+#endif -+ - static struct { - /* Original value. */ - const char *arg0; -@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); - * for code linking against that version, and change the default to use the - * new version, so that new code depends on the implemented version. */ - #ifdef HAVE_TYPEOF -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+// -+// HACK: even weak aliasing breaks in clang so just comment this out for now -+// -+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl"))); -+#else - extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); -+#endif - #else - void setproctitle_stub(const char *fmt, ...) - __attribute__((alias("setproctitle_impl"))); -diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..e01cb60 100644 ---- a/src/strlcat.c -+++ b/src/strlcat.c -@@ -27,7 +27,11 @@ - * If retval >= dsize, truncation occurred. - */ - size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcat(char *dst, const char *src, size_t dsize) -+#else - strlcat(char *dst, const char *src, size_t dsize) -+#endif - { - const char *odst = dst; - const char *osrc = src; -diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..10a855f 100644 ---- a/src/strlcpy.c -+++ b/src/strlcpy.c -@@ -25,7 +25,11 @@ - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ - size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcpy(char *dst, const char *src, size_t dsize) -+#else - strlcpy(char *dst, const char *src, size_t dsize) -+#endif - { - const char *osrc = src; - size_t nleft = dsize; -diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..c463243 100644 ---- a/src/strmode.c -+++ b/src/strmode.c -@@ -33,7 +33,11 @@ - #include - - void -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strmode(mode_t mode, char *p) -+#else - strmode(mode_t mode, char *p) -+#endif - { - /* print type */ - switch (mode & S_IFMT) { diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix deleted file mode 100644 index ff9412ceb580..000000000000 --- a/pkgs/development/libraries/libbsd/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "libbsd-${version}"; - version = "0.8.7"; - - src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; - }; - - # darwin changes configure.ac which means we need to regenerate - # the configure scripts - nativeBuildInputs = [ autoreconfHook ]; - - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch - # Suitable for all, but limited to musl to avoid rebuilds - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 - ./non-glibc.patch - # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd - ./cdefs.patch - # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 - ./features.patch - ]; - - meta = with stdenv.lib; { - description = "Common functions found on BSD systems"; - homepage = https://libbsd.freedesktop.org/; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; -} diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch deleted file mode 100644 index 66bd1e9232ba..000000000000 --- a/pkgs/development/libraries/libbsd/features.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:42:52 +0100 -Subject: Remove inclusion from - -This is a non-portable header, and we should not assume it is present. -Let the first system header pull it in if needed. ---- - include/bsd/libutil.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index ccca29a..e5f148a 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -39,7 +39,6 @@ - #ifndef LIBBSD_LIBUTIL_H - #define LIBBSD_LIBUTIL_H - --#include - #ifdef LIBBSD_OVERLAY - #include - #else --- -cgit v1.1 - diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch deleted file mode 100644 index f61e0d242943..000000000000 --- a/pkgs/development/libraries/libbsd/non-glibc.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:39:45 +0100 -Subject: Fix function declaration protection for glibc already providing them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On non-glibc based systems we cannot unconditionally use the -__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, -if it is undefined, define it to 0. - -We should also always declare these functions on non-glibc based -systems. And on systems with a new enough glibc, which provides these -functions, we should still provide the declarations if _GNU_SOURCE -is *not* defined. - -Reported-by: Jörg Krause ---- - include/bsd/stdlib.h | 3 ++- - include/bsd/string.h | 3 ++- - include/bsd/sys/cdefs.h | 8 ++++++++ - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index 8d33d1f..a5b063c 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 29097f6..f987fee 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS -diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h -index b4c8f30..d1cc419 100644 ---- a/include/bsd/sys/cdefs.h -+++ b/include/bsd/sys/cdefs.h -@@ -59,6 +59,14 @@ - #endif - - /* -+ * On non-glibc based systems, we cannot unconditionally use the -+ * __GLIBC_PREREQ macro as it gets expanded before evaluation. -+ */ -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(maj, min) 0 -+#endif -+ -+/* - * Some kFreeBSD headers expect those macros to be set for sanity checks. - */ - #ifndef _SYS_CDEFS_H_ --- -cgit v1.1 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9d7ec7c5d4c..ac8c97bdfaa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2371,8 +2371,6 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; - libbsd = callPackage ../development/libraries/libbsd { }; - libbladeRF = callPackage ../development/libraries/libbladeRF { }; lp_solve = callPackage ../applications/science/math/lp_solve { }; @@ -21462,6 +21460,8 @@ with pkgs; mount wall hostname more sysctl getconf getent; + libbsd = netbsd.compat; + inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; From e99322507e4535c64c0aab9a5a6b15ae3ffaf761 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:33:36 -0400 Subject: [PATCH 093/153] treewide: get rid of musl stuff --- pkgs/os-specific/linux/musl/fts-setup-hook.sh | 4 ---- pkgs/os-specific/linux/musl/fts.nix | 19 ------------------- pkgs/os-specific/linux/musl/getconf.nix | 19 ------------------- pkgs/os-specific/linux/musl/getent.nix | 18 ------------------ pkgs/tools/compression/xar/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 5 ++--- pkgs/top-level/unix-tools.nix | 10 +++++----- 7 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 pkgs/os-specific/linux/musl/fts-setup-hook.sh delete mode 100644 pkgs/os-specific/linux/musl/fts.nix delete mode 100644 pkgs/os-specific/linux/musl/getconf.nix delete mode 100644 pkgs/os-specific/linux/musl/getent.nix diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh deleted file mode 100644 index 5cf8c753aec3..000000000000 --- a/pkgs/os-specific/linux/musl/fts-setup-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -export NIX_${role_pre}LDFLAGS+=" -lfts" diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix deleted file mode 100644 index 24d25de3a2d9..000000000000 --- a/pkgs/os-specific/linux/musl/fts.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: - -stdenv.mkDerivation rec { - name = "musl-fts-${version}"; - version = "2017-01-13"; - src = fetchFromGitHub { - owner = "pullmoll"; - repo = "musl-fts"; - rev = "0bde52df588e8969879a2cae51c3a4774ec62472"; - sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - setupHooks = [ - ../../../build-support/setup-hooks/role.bash - ./fts-setup-hook.sh - ]; -} diff --git a/pkgs/os-specific/linux/musl/getconf.nix b/pkgs/os-specific/linux/musl/getconf.nix deleted file mode 100644 index dbfaca296bf9..000000000000 --- a/pkgs/os-specific/linux/musl/getconf.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "musl-getconf"; - src = fetchurl { - url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c"; - sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq"; - }; - - unpackPhase = ":"; - - buildPhase = ''$CC $src -o getconf''; - installPhase = '' - mkdir -p $out/bin - cp getconf $out/bin/ - ''; -} - - diff --git a/pkgs/os-specific/linux/musl/getent.nix b/pkgs/os-specific/linux/musl/getent.nix deleted file mode 100644 index 6eed17a76b02..000000000000 --- a/pkgs/os-specific/linux/musl/getent.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "musl-getent"; - src = fetchurl { - url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c"; - sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk"; - }; - - unpackPhase = ":"; - - buildPhase = ''$CC $src -o getent''; - installPhase = '' - mkdir -p $out/bin - cp getent $out/bin/ - ''; -} - diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 01d18fe6ad7d..69d4284b795d 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }: +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ libxml2 openssl zlib bzip2 fts ]; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac8c97bdfaa3..d5fc9283e0f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13843,9 +13843,6 @@ with pkgs; multipath-tools = callPackage ../os-specific/linux/multipath-tools { }; musl = callPackage ../os-specific/linux/musl { }; - musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; - musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; - musl-getent = callPackage ../os-specific/linux/musl/getent.nix { }; nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -21460,6 +21457,8 @@ with pkgs; mount wall hostname more sysctl getconf getent; + fts = if hostPlatform.isMusl then netbsd.fts else null; + libbsd = netbsd.compat; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index c057aa45be6f..f8e269168a13 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -50,14 +50,14 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if hostPlatform.isMusl then pkgs.musl-getconf - else lib.getBin stdenv.cc.libc; + linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if hostPlatform.isMusl then pkgs.musl-getent - # This may not be right on other platforms, but preserves existing behavior - else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin; + linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + else pkgs.netbsd.getent; + darwin = pkgs.netbsd.getent; }; getopt = { linux = pkgs.utillinux; From 3c1ee736df3b3013cf77ec4676441c7364d312f9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:41:41 -0400 Subject: [PATCH 094/153] Revert "cairo: fix build inputs" This reverts commit e557a432e07441a508544fca2aba3be6fd9860c0. Sorry about this. Accidentally got into my git push. Did not mean to cause a mass rebuild! --- pkgs/development/libraries/cairo/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7f6419272dd9..74ae4abaedf9 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -25,9 +25,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - ]; - - buildInputs = [ libiconv libintl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From ae6a4a913cfa6f51c9c4bfd30c401dba88b81e2d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 12:44:17 -0400 Subject: [PATCH 095/153] fix eval --- pkgs/os-specific/linux/libselinux/default.nix | 7 +++---- pkgs/top-level/unix-tools.nix | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 59d5db52ac68..a172e45e7faa 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pcre, pkgconfig, libsepol , enablePython ? true, swig ? null, python ? null -, musl-fts +, fts }: assert enablePython -> swig != null && python != null; @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ] - ++ optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ libsepol pcre fts ] + ++ optionals enablePython [ swig python ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index f8e269168a13..64979ba3234d 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -50,12 +50,12 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; From d38d1ed44f44da5481d7a010a113056c6ec09299 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 31 May 2018 19:22:23 +0200 Subject: [PATCH 096/153] jl: 0.0.4 -> 0.0.5 (#41319) --- pkgs/development/tools/jl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index ea6214284582..6ab331ebc6a3 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -5,12 +5,12 @@ }: mkDerivation rec { pname = "jl"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "chrisdone"; repo = "jl"; rev = "v${version}"; - sha256 = "0wsdfj4m729q0kjpkn0ywpncdhvpvvprd4rh45vcg6kjw20krm3r"; + sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar"; }; isLibrary = true; isExecutable = true; From 9d99fcf8a14571749c75d33d4c93119a43cfcb20 Mon Sep 17 00:00:00 2001 From: James Kay Date: Thu, 31 May 2018 18:24:30 +0100 Subject: [PATCH 097/153] compton-git: 2016-08-10 -> 2018-05-21 (#41317) --- pkgs/applications/window-managers/compton/git.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 53bcd158aedd..dd2559d2b15c 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -3,14 +3,15 @@ pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, libXrandr, libXrender, xwininfo }: -stdenv.mkDerivation { - name = "compton-git-2016-08-10"; +stdenv.mkDerivation rec { + name = "compton-git-${version}"; + version = "2018-05-21"; src = fetchFromGitHub { - owner = "chjj"; + owner = "yshui"; repo = "compton"; - rev = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a"; - sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p"; + rev = "9b24550814b7c69065f90039b0a5d0a2281b9f81"; + sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl"; }; nativeBuildInputs = [ @@ -44,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fork of XCompMgr, a sample compositing manager for X servers (git version)"; - homepage = https://github.com/chjj/compton/; + homepage = https://github.com/yshui/compton/; license = licenses.mit; longDescription = '' A fork of XCompMgr, which is a sample compositing manager for X @@ -53,7 +54,7 @@ stdenv.mkDerivation { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainers = [ maintainers.ertes ]; + maintainers = [ maintainers.ertes maintainers.twey ]; platforms = platforms.linux; }; } From 0c7f4106044ba039be8cf7aa4c491055a02aa474 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 31 May 2018 19:39:53 +0200 Subject: [PATCH 098/153] postgis: 2.4.3 -> 2.4.4 (#41278) See http://svn.osgeo.org/postgis/tags/2.4.4/NEWS for release notes --- pkgs/development/libraries/postgis/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index d201654fbb4c..9a72e03ef2c6 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -44,8 +44,8 @@ let - version = "2.4.3"; - sha256 = "1fg4pmla5m903m76ndjd8q5dkcykf67v1p4dcajmnr3bvg2p8lza"; + version = "2.4.4"; + sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6"; in stdenv.mkDerivation rec { name = "postgis-${version}"; @@ -54,17 +54,6 @@ in stdenv.mkDerivation rec { inherit sha256; }; - patches = [ - (fetchpatch { - url = "https://trac.osgeo.org/postgis/changeset/16417?format=diff&new=16417"; - name = "json-c-0.13.patch"; - sha256 = "1hk2fh4nsvq76ksi7z4shlgj7fik6ac3sjsb0khsypsjfhz7ic8z"; - stripLen = 3; - extraPrefix = ""; - excludes = [ "NEWS" ]; - }) - ]; - # don't pass these vars to the builder removeAttrs = ["sql_comments" "sql_srcs"]; From e48b54c0789c38bd7de7438c112197f95b6b8ca1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 31 May 2018 19:44:31 +0200 Subject: [PATCH 099/153] qgis: 2.18.17 -> 2.18.20 (#41195) --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 896387b1f7f4..279d83e92193 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.17"; + name = "qgis-2.18.20"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y"; + sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g"; }; # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system From cf2604004e4b091da6a2deb5e0455c960d3e7d1e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 31 May 2018 12:39:52 -0500 Subject: [PATCH 100/153] haskellPackages.ghc84x.singletons: disable test suite for ghc-8.4.3 Otherwise, the test suite fails, due to the 'Lambdas' test failing: Lambdas: FAIL (1.06s) 42c42 < foo8 x = (\ Foo a _ -> a) x --- > foo8 x = (\ (Foo a _) -> a) x I assume this is a minor bogus failure due to some change in 8.4.3 that nobody expected. Signed-off-by: Austin Seipp --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index c4ba4b9cba73..f94d6e15b957 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -120,7 +120,7 @@ self: super: { prePatch = "cd lambdacube-ir.haskell; "; }); - singletons = super.singletons_2_4_1; + singletons = dontCheck super.singletons_2_4_1; th-desugar = super.th-desugar_1_8; ## Upstreamed, awaiting a Hackage release From 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 13:41:21 -0400 Subject: [PATCH 101/153] nixos: disable gdk-pixbuf test The test currently relies on installedTests output which was reverted in 85ae7137ac6a1623be90c8f0897566367d300c12. See https://github.com/NixOS/nixpkgs/commit/85ae7137ac6a1623be90c8f0897566367d300c12 for discussion. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 1e52c0f86a7a..13174f992e62 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -289,7 +289,7 @@ in rec { tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; - tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; + #tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; From c425a1fc5002a1642036a74d67b200e47f19cefb Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Thu, 22 Jun 2017 21:43:03 -0400 Subject: [PATCH 102/153] haskell: add *FrameworkDepends arguments --- .../haskell-modules/generic-builder.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a1b92595c78d..941ba31d34c3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -35,6 +35,10 @@ in , enableStaticLibraries ? !hostPlatform.isWindows , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] +# On macOS, statically linking against system frameworks is not supported; +# see https://developer.apple.com/library/content/qa/qa1118/_index.html +# They must be propagated to the environment of any executable linking with the library +, libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile , hydraPlatforms ? null @@ -47,8 +51,8 @@ in , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] -, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] -, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [] +, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] +, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" , broken ? false , preCompileBuildDriver ? "", postCompileBuildDriver ? "" @@ -178,11 +182,11 @@ let nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; - propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; + otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ allPkgconfigDepends ++ - optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ - optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++ + optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; From a22faf10606aa91d6e7971ed43acea722d36f37d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 31 May 2018 13:03:46 -0500 Subject: [PATCH 103/153] haskellPackages.ghc84x.criterion: bump to criterion 1.4.1.0 We need base-compat-0.10 for 8.4, but the older version wanted 0.9. (Criterion 1.4.1.0 now uses base-compat-batteries-0.10, in fact) Signed-off-by: Austin Seipp --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index f94d6e15b957..55e80d7fb0c3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -136,6 +136,8 @@ self: super: { }; }); + ## Bounds related: it wants base-compat 0.9. + criterion = super.criterion_1_4_1_0; ## Unmerged From e4e89672698362ebb71229cf773f26f86939d994 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 14:05:56 -0400 Subject: [PATCH 104/153] haskell: fixup merge of c425a1fc5002a1642036a74d67b200e47f19cefb This was accidentally included even though setupHaskellDepends is already listed above. --- 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 941ba31d34c3..629910fd62e1 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -183,7 +183,7 @@ let setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; - otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ + otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends); From 125ff1ec54173791490c0924a937c9860ac2acba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 May 2018 11:40:34 -0700 Subject: [PATCH 105/153] uftp: 4.9.6 -> 4.9.7 (#41236) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uftp/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp had a zero exit code or showed the expected version - /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpd passed the binary check. - /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp_keymgt passed the binary check. - Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpproxyd had a zero exit code or showed the expected version - 2 of 4 passed binary check by having a zero exit code. - 0 of 4 passed binary check by having the new version present in output. - found 4.9.7 with grep in /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7 - directory tree listing: https://gist.github.com/1fe6684f427417f8a9e189f960c84a74 - du listing: https://gist.github.com/15a89b170d541884994e503690c961ef --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index d1ec31d6b856..a484e0382104 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.6"; + version = "4.9.7"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "0byg7ff39i32ljzqxn6rhiz3zs1b04y50xpvzmjx5v8pmdajn0sz"; + sha256 = "1gh1zpc6dh690xjhfp5x2ajhwjkchyh5wazr8agm6axxwqhd9gn8"; }; buildInputs = [ openssl ]; From 8ad1476755ad5686bc68e060d41f8d1ce308e981 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 31 May 2018 21:19:57 +0200 Subject: [PATCH 106/153] multi-ghc-travis: update to latest git version for ghc-8.4.3 support --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 394e603ee217..b9f6db1cc947 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "a0d76bc5dde3b1cc790a32f84b9ce084e7596f1e"; - sha256 = "1wrn9f5rz0nafcwisima6rp18v3a2kjgsyq2wj7vhinqwx9z72r4"; + rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424"; + sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq"; }; isLibrary = true; isExecutable = true; From 5421c6f156f4e2082a997fac68526c1c338cdfdb Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 31 May 2018 21:42:26 +0200 Subject: [PATCH 107/153] atom, atom-beta: 1.27.1 -> 1.27.2, 1.28.0-beta1 -> 1.28.0-beta2 (#41318) --- pkgs/applications/editors/atom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7a88d761a345..f80a14c1e0f3 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -58,12 +58,12 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.27.1"; - sha256 = "08slv8s90wz2jcdrcqh2d815wfbrkwcdx9c3qbx8cml04hz8p2gx"; + version = "1.27.2"; + sha256 = "0xriv142asc82mjxzkqsafaqalxa3icz4781z2fsgyfkkw6zbz2v"; }; atom-beta = { - version = "1.28.0-beta1"; - sha256 = "1mkxq2a7sylj9jx1bs2v1pmgrwc10cgh810qic1lncq9jzpaik0n"; + version = "1.28.0-beta2"; + sha256 = "0fc9j1l776hv057dirw2bv9wmvhcaba5c4nq1cgs5rb5whxir2n6"; }; } From 0fbc3451ef82f73ecc1a6ae10c68a72bbf13abf9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 May 2018 12:47:30 -0700 Subject: [PATCH 108/153] byacc: 20180510 -> 20180525 (#41304) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/byacc/versions. These checks were done: - built on NixOS - /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525/bin/yacc passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 20180525 with grep in /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525 - directory tree listing: https://gist.github.com/fffd356f1d450bf13fc3f2bf8a8f5304 - du listing: https://gist.github.com/3e8f1a51d1e20db022ff93cedc85b5a7 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 2f8c97ff2711..17d1e47cb4ed 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20180510"; + version = "20180525"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h"; + sha256 = "1ridghk1xprxfg2k8ls87wjc00i4a7f39x2fkswfqb2wwf5qv6qj"; }; doCheck = true; From 05eb57b35d2859dd3981ab20c7e2a2ccfc530b75 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 15:55:06 -0400 Subject: [PATCH 109/153] Revert "nixpkgs module: Fix defaulting of `localSystem` and `system`" This reverts commit 4fe289860888668956b7e79e24efeb101c2f51d1. This gives a recursion in certain nixpkgs configs. --- nixos/modules/misc/nixpkgs.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 29019ed3d552..8fbe218b232a 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -1,10 +1,9 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.nixpkgs; - opts = options.nixpgs; isConfig = x: builtins.isAttrs x || lib.isFunction x; @@ -63,11 +62,12 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (cfg) config overlays localSystem crossSystem; + inherit (config.nixpkgs) config overlays localSystem crossSystem; } ''; default = import ../../.. { - inherit (cfg) config overlays localSystem crossSystem; + localSystem = { inherit (cfg) system; } // cfg.localSystem; + inherit (cfg) config overlays crossSystem; }; type = pkgsType; example = literalExample ''import {}''; @@ -140,7 +140,7 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform - default = { system = cfg.system or builtins.currentSystem; }; + default = { system = builtins.currentSystem; }; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; defaultText = literalExample ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; @@ -179,8 +179,6 @@ in system = mkOption { type = types.str; - default = cfg.localSystem.system - or opts.localSystem.default.system; example = "i686-linux"; description = '' Specifies the Nix platform type on which NixOS should be built. @@ -198,7 +196,6 @@ in See nixpkgs.localSystem for more information. - Ignored when nixpkgs.localSystem is set. Ignored when nixpkgs.pkgs is set. ''; }; From 9d456bf0c136234e4e9150f92c956727668bb405 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 31 May 2018 21:57:29 +0200 Subject: [PATCH 110/153] traefik: 1.5.2 -> 1.6.2 (#41208) Signed-off-by: Vincent Demeester --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d38405688fc5..1ed50a65e91a 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.5.2"; + version = "1.6.2"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0cv05nm7jj1g2630l5zmzpmsrjx712ba3l7klh8nqs02mzykzsha"; + sha256 = "1gklji9zwdprvv7fvy7rhgazfslwsyjq97w193v9dpsriz1rk5qa"; }; buildInputs = [ go-bindata bash ]; @@ -34,6 +34,6 @@ buildGoPackage rec { homepage = https://traefik.io; description = "A modern reverse proxy"; license = licenses.mit; - maintainers = with maintainers; [ hamhut1066 ]; + maintainers = with maintainers; [ hamhut1066 vdemeester ]; }; } From 0b6dd07980975cf0db8573241fca5933ec4dc0d5 Mon Sep 17 00:00:00 2001 From: Colin King Date: Thu, 31 May 2018 13:03:48 -0700 Subject: [PATCH 111/153] kafka: include Kafka Connect shell scripts (#41322) Kafka Connect is a newer addition to Kafka and these scripts may be handy to keep around. --- pkgs/servers/apache-kafka/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index fe67bdd0282c..fd9c48f3469e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp bin/kafka* $out/bin + cp bin/connect* $out/bin # allow us the specify logging directory using env substituteInPlace $out/bin/kafka-run-class.sh \ From 58ce59dd96102dcdda28c162c4f8a3d397368af1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 May 2018 16:29:02 -0400 Subject: [PATCH 112/153] haskell infra: Allow overriding `haskellSrc2nix` --- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2a96c66dced5..271f1c1a8f72 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -149,7 +149,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { filter = path: type: pkgs.lib.hasSuffix "${name}.cabal" path || baseNameOf path == "package.yaml"; - expr = haskellSrc2nix { + expr = self.haskellSrc2nix { inherit name; src = if pkgs.lib.canCleanSource src then pkgs.lib.cleanSourceWith { inherit src filter; } From aee19ca7f8fd3d49fc5f9f459c6c6fe439673950 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 31 May 2018 22:58:04 +0200 Subject: [PATCH 113/153] dd-agent: fix compatibility issue with iostat (#41035) Applies a patch to the dd-agent derivation that fixes a compatibility issue with the current version of iostat, which no longer contains a colon after its table headers. This patch is applied in order for the fix to be backportable to existing stable releases. A final "proper" fix will be an upgrade to a newer version of dd-agent, but that requires several other changes. This fixes #40103. --- .../dd-agent/40103-iostat-fix.patch | 30 +++++++++++++++++++ pkgs/tools/networking/dd-agent/default.nix | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/dd-agent/40103-iostat-fix.patch diff --git a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch new file mode 100644 index 000000000000..9897a76c957d --- /dev/null +++ b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch @@ -0,0 +1,30 @@ +diff --git a/checks/system/unix.py b/checks/system/unix.py +index c37af3c3..58c72626 100644 +--- a/checks/system/unix.py ++++ b/checks/system/unix.py +@@ -39,7 +39,7 @@ class IO(Check): + self.value_re = re.compile(r'\d+\.\d+') + + def _parse_linux2(self, output): +- recentStats = output.split('Device:')[2].split('\n') ++ recentStats = output.split('Device')[2].split('\n') + header = recentStats[0] + headerNames = re.findall(self.header_re, header) + device = None +@@ -123,14 +123,14 @@ class IO(Check): + + # Linux 2.6.32-343-ec2 (ip-10-35-95-10) 12/11/2012 _x86_64_ (2 CPU) + # +- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util ++ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util + # sda1 0.00 17.61 0.26 32.63 4.23 201.04 12.48 0.16 4.81 0.53 1.73 + # sdb 0.00 2.68 0.19 3.84 5.79 26.07 15.82 0.02 4.93 0.22 0.09 + # sdg 0.00 0.13 2.29 3.84 100.53 30.61 42.78 0.05 8.41 0.88 0.54 + # sdf 0.00 0.13 2.30 3.84 100.54 30.61 42.78 0.06 9.12 0.90 0.55 + # md0 0.00 0.00 0.05 3.37 1.41 30.01 18.35 0.00 0.00 0.00 0.00 + # +- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util ++ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util + # sda1 0.00 0.00 0.00 10.89 0.00 43.56 8.00 0.03 2.73 2.73 2.97 + # sdb 0.00 0.00 0.00 2.97 0.00 11.88 8.00 0.00 0.00 0.00 0.00 + # sdg 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 805b0dddcacf..1038882573bc 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -38,6 +38,8 @@ in stdenv.mkDerivation rec { sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx"; }; + patches = [ ./40103-iostat-fix.patch ]; + buildInputs = [ python unzip @@ -59,6 +61,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp -R $src $out/agent chmod u+w -R $out + (cd $out/agent; patchPhase) PYTHONPATH=$out/agent:$PYTHONPATH ln -s $out/agent/agent.py $out/bin/dd-agent ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd From e4ba5dc3d6d4948f8ddb4efb145504ce615c546c Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Fri, 1 Jun 2018 00:04:50 +0300 Subject: [PATCH 114/153] gitkraken: 3.6.0 -> 3.6.1 (#41130) --- .../version-management/gitkraken/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index cf68da44a5fa..74364327645d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8"; + sha256 = "1f77y281r3dp35vw3zdai2cgwwy2gpg7px6g66ylfz4gkig26dz8"; }; libPath = makeLibraryPath [ @@ -54,41 +54,47 @@ stdenv.mkDerivation rec { libgnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - desktopItem = makeDesktopItem { name = "gitkraken"; exec = "gitkraken"; - icon = "app"; + icon = "gitkraken"; desktopName = "GitKraken"; genericName = "Git Client"; categories = "Application;Development;"; comment = "Graphical Git client from Axosoft"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg ]; - unpackPhase = "true"; - buildCommand = '' - mkdir -p $out - dpkg -x $src $out - substituteInPlace $out/usr/share/applications/gitkraken.desktop \ - --replace /usr/share/gitkraken $out/bin - cp -av $out/usr/* $out - rm -rf $out/etc $out/usr $out/share/lintian - chmod -R g-w $out + unpackCmd = '' + mkdir out + dpkg -x $curSrc out + ''; - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + installPhase = '' + mkdir $out + pushd usr + pushd share + substituteInPlace applications/gitkraken.desktop \ + --replace /usr/share/gitkraken $out/bin \ + --replace Icon=app Icon=gitkraken + mv pixmaps/app.png pixmaps/gitkraken.png + popd + rm -rf bin/gitkraken share/lintian + cp -av share bin $out/ + popd + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + ''; + + postFixup = '' + pushd $out/share/gitkraken + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken + + for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true done - - find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \; - - mkdir $out/bin - ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + popd ''; meta = { From 2d3db84ddbb3555e48464b5cc20747f71c458c28 Mon Sep 17 00:00:00 2001 From: coretemp <34454443+coretemp@users.noreply.github.com> Date: Thu, 31 May 2018 23:15:19 +0200 Subject: [PATCH 115/153] dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039) --- nixos/modules/services/networking/dnscrypt-proxy.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 6f5e7d8d456e..8edcf925dbfa 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -145,6 +145,9 @@ in } ]; + # make man 8 dnscrypt-proxy work + environment.systemPackages = [ pkgs.dnscrypt-proxy ]; + users.users.dnscrypt-proxy = { description = "dnscrypt-proxy daemon user"; isSystemUser = true; From 7aca4b47c8d312fdb10b086c5d93d04d884fc62f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 May 2018 17:15:50 -0400 Subject: [PATCH 116/153] add sys/tree.h is needed for mg --- pkgs/os-specific/bsd/netbsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index eb305d5b3db7..950694d0bfe3 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -205,6 +205,7 @@ let install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h + install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h mkdir -p $out/lib/pkgconfig substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ From c6c2e65c2da191f09edfa4554d79408943816ef1 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 21:27:41 +0000 Subject: [PATCH 117/153] graalvm8: 0.31 -> 1.0.0-rc1 (#41335) Minor update and fix the build which is broken since the default GCC hardening was changed --- .../development/compilers/graalvm/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 2eb9c4a7e835..ff269afd1a64 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -23,11 +23,15 @@ let rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; } rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; } + rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } + rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; } rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; } rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; } + rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } + rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; } rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; } rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; } @@ -50,13 +54,14 @@ let in rec { - mx = stdenv.mkDerivation { + mx = stdenv.mkDerivation rec { + version = "5.171.0"; name = "mx"; src = fetchFromGitHub { owner = "graalvm"; repo = "mx"; - rev = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16 - sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563"; + rev = version; + sha256 = "0ag3g49fnjrnlmjb55dbn9l2cwyvanx36f5hyf21ad8px05fh6jv"; }; nativeBuildInputs = [ makeWrapper ]; buildPhase = '' @@ -77,9 +82,9 @@ in rec { # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too) jvmci8 = stdenv.mkDerivation rec { - version = "0.41"; + version = "0.43"; name = let - n = "jvmci8u161-${version}"; + n = "jvmci8u171-${version}"; in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then n else @@ -88,7 +93,7 @@ in rec { owner = "graalvm"; repo = "graal-jvmci-8"; rev = "jvmci-${version}"; - sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr"; + sha256 = "0jkp67m7s252kngxnj0yp397pgx5z95v1lbi68v9g4dw050l28rk"; }; buildInputs = [ mx mercurial ]; postUnpack = '' @@ -101,8 +106,10 @@ in rec { hg checkout ${lib.escapeShellArg src.rev} ) ''; + hardeningDisable = [ "fortify" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" # newly detected by gcc7 + "-Wno-error=nonnull" ]; buildPhase = '' cp -dpR ${oraclejdk8} writable-copy-of-jdk @@ -122,9 +129,9 @@ in rec { }; graalvm8 = stdenv.mkDerivation rec { - version = "0.31"; + version = "1.0.0-rc1"; name = let - n = "graal-vm-8-${version}"; + n = "graal-${version}"; in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then n else @@ -132,8 +139,8 @@ in rec { src = fetchFromGitHub { owner = "oracle"; repo = "graal"; - rev = "vm-enterprise-${version}"; - sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676"; + rev = "vm-${version}"; + sha256 = "1j1m53d8x0mkvqr9lwlkjddfha5jrsq9hxlblbjv1bqcivfmmfn7"; }; buildInputs = [ mx zlib mercurial jvmci8 ]; postUnpack = '' @@ -167,7 +174,6 @@ in rec { cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/ echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties ln -s --relative $out/jre/bin/native-image $out/bin/native-image - cp $out/jre/tools/nfi/bin/libtrufflenfi.so $out/jre/lib/amd64/ cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/ # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html @@ -193,7 +199,7 @@ in rec { $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' # Ahead-Of-Time compilation - $out/bin/native-image -no-server HelloWorld + $out/bin/native-image --no-server HelloWorld ./helloworld ./helloworld | fgrep 'Hello World' ''; From 75f20c2e3e5ad81a996c33e8c5462263ac757e46 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 21:33:15 +0000 Subject: [PATCH 118/153] frostwire: 6.6.3 -> 6.6.7 --- pkgs/applications/networking/p2p/frostwire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 727999414020..79d0e9acef92 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let - version = "6.6.3-build-253"; + version = "6.6.7-build-529"; name = "frostwire-desktop-${version}"; src = fetchFromGitHub { owner = "frostwire"; repo = "frostwire"; rev = name; - sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7"; + sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m"; }; desktopItem = makeDesktopItem { @@ -40,7 +40,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc"; + outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c"; }; in stdenv.mkDerivation { From 001a84f22adb50971c5d3898012eb92a5c90d503 Mon Sep 17 00:00:00 2001 From: symphorien Date: Thu, 31 May 2018 21:33:48 +0000 Subject: [PATCH 119/153] etherape: 0.9.13 -> 0.9.17 (#41332) fixes startup --- .../networking/sniffers/etherape/default.nix | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index f01a36cc65f5..9c27139c66d2 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui -, gnomedocutils, scrollkeeper, libxslt }: +{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, +libgnomecanvas, popt, itstool }: stdenv.mkDerivation rec { - name = "etherape-0.9.13"; + name = "etherape-0.9.17"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a"; + sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6"; }; - configureFlags = [ "--disable-scrollkeeper" ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ itstool pkgconfig ]; buildInputs = [ - libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils - scrollkeeper libxslt + libtool gtk2 libpcap libglade libgnomecanvas popt ]; - meta = { + meta = with stdenv.lib; { homepage = http://etherape.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + platforms = with platforms; linux; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9d7ec7c5d4c..d7c718fe8780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15647,7 +15647,7 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper; + inherit (gnome2) libgnomecanvas libglade; }; evilvte = callPackage ../applications/misc/evilvte { From 2bd46c6b8029c7a3f3abff6c8b2336734f12bcc5 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 21:34:21 +0000 Subject: [PATCH 120/153] frostwire-bin: 6.6.5 -> 6.6.7 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 84ed1ff92591..d634502a0352 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.6.5"; + version = "6.6.7"; name = "frostwire-${version}"; src = fetchurl { url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; + sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh"; }; nativeBuildInputs = [ makeWrapper ]; From 8b984ba61e011b02466dc7f371a4d84ed81a713d Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 31 May 2018 22:10:44 +0000 Subject: [PATCH 121/153] frostwire: disable auto-update --- .../applications/networking/p2p/frostwire/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 79d0e9acef92..8cb5f768f956 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -52,8 +52,15 @@ in stdenv.mkDerivation { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) ( cd desktop + + # disable auto-update (anyway it won't update frostwire installed in nix store) + substituteInPlace src/com/frostwire/gui/updates/UpdateManager.java \ + --replace 'um.checkForUpdates' '// um.checkForUpdates' + + # fix path to mplayer substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \ --replace /usr/bin/mplayer ${mplayer}/bin/mplayer + substituteInPlace build.gradle \ --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' gradle --offline --no-daemon build @@ -66,8 +73,8 @@ in stdenv.mkDerivation { cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib"; - x86_64-linux = "desktop/lib/native/libjlibtorrent.so"; - i686-linux = "desktop/lib/native/libjlibtorrentx86.so"; + x86_64-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so"; + i686-linux = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}") } $out/lib From ae8b7a189ac3cd4509d7e21f72e5477aa61a3db4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Jun 2018 00:13:15 +0200 Subject: [PATCH 122/153] Revert "Revert commit 4b2f3971981272b79da7f87b639ca8854a6ea89c" This reverts commit 85ae7137ac6a1623be90c8f0897566367d300c12. --- .../libraries/gdk-pixbuf/default.nix | 70 ++++++++++++++----- .../gdk-pixbuf/installed-tests-path.patch | 13 ++++ .../gdk-pixbuf/no-mime-sniffing.patch | 18 +++++ 3 files changed, 84 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 7660d6481c3c..849e72d9a976 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,39 +4,72 @@ let pname = "gdk-pixbuf"; - version = "2.36.7"; - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared-mime-info files during runtime. + version = "2.36.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; + # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball + # src = fetchurl { + # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; + # }; + src = fetchgit { + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git; + rev = version; + sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv"; }; - outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which requires access to shared-mime-info files during runtime. + # For now, we are patching the build script to avoid the dependency. + ./no-mime-sniffing.patch + + # Fix installed tests with meson + # https://bugzilla.gnome.org/show_bug.cgi?id=795527 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371381; + sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn"; + }) + + # Add missing test file bug753605-atsize.jpg + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch; + sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; + }) + + # Move installed tests to a separate output + ./installed-tests-path.patch + ]; + + outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; setupHook = ./setup-hook.sh; - enableParallelBuilding = true; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 gobjectIntrospection ]; + buildInputs = [ libX11 ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ + meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + gtk-doc gobjectIntrospection makeWrapper + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - configureFlags = "--with-libjasper --with-x11" - + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" - ; + mesonFlags = [ + "-Ddocs=true" + "-Djasper=true" + "-Dx11=true" + "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" + ]; - # on darwin, tests don't link - preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' - substituteInPlace Makefile --replace "docs tests" "docs" + postPatch = '' + chmod +x build-aux/* # patchShebangs only applies to executables + patchShebangs build-aux + + substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; postInstall = @@ -44,6 +77,9 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ + $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch library references or binaries. diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch new file mode 100644 index 000000000000..1da2b0a10dcd --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch @@ -0,0 +1,13 @@ +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -85,8 +85,8 @@ + 'aero.gif', + ] + +-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) +-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name()) ++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name()) ++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name()) + + install_data(test_data, install_dir: installed_test_bindir) + install_subdir('test-images', install_dir: installed_test_bindir) diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch new file mode 100644 index 000000000000..9896e25acda1 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch @@ -0,0 +1,18 @@ +--- a/meson.build ++++ b/meson.build +@@ -186,13 +186,8 @@ + gmodule_dep = dependency('gmodule-no-export-2.0') + gio_dep = dependency('gio-2.0') + +-# On non-Windows/macOS systems we always required shared-mime-info and GIO +-if host_system != 'windows' and host_system != 'darwin' +- shared_mime_dep = dependency('shared-mime-info') +- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) +-else +- shared_mime_dep = [] +-endif ++# No MIME sniffing for now ++shared_mime_dep = [] + + gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] + From 6d3b9763a6b343531a510ca495ec1bc260d41c32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Jun 2018 00:14:59 +0200 Subject: [PATCH 123/153] gdk-pixbuf: make loaders builtin on Darwin Meson produces faulty loaders on Darwin, building them into the library bypasses that. https://github.com/NixOS/nixpkgs/commit/4b2f3971981272b79da7f87b639ca8854a6ea89c --- pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 849e72d9a976..b0a86644afb2 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "-Djasper=true" "-Dx11=true" "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-Dbuiltin_loaders=all"; postPatch = '' chmod +x build-aux/* # patchShebangs only applies to executables From 86c4a640b4c952388831a516fbebc060b6e7868b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 Jun 2018 00:17:38 +0200 Subject: [PATCH 124/153] Revert "nixos: disable gdk-pixbuf test" This reverts commit 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 13174f992e62..1e52c0f86a7a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -289,7 +289,7 @@ in rec { tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; - #tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; + tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; From ef7e0e8347b630b08a7fbb6f82ac45636a31afc2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jun 2018 00:21:04 +0200 Subject: [PATCH 125/153] scdoc: 1.3.3 -> 1.3.4 --- pkgs/tools/typesetting/scdoc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index b3c256e94869..d6bdbf920852 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,16 +2,15 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "1xkfsrzpbm68522b1dml9dghnwb5dlwpf91c1i4y51rgv3hdgwdj"; + sha256 = "131f6sd4azpc988kwzlrc9c4x98abhfnxr5wpk7i427ha84g89yb"; }; postPatch = '' substituteInPlace Makefile \ - --replace "VERSION=1.2.3" "VERSION=${version}" \ --replace "-static" "" \ --replace "/usr/local" "$out" ''; From 0046d4239767f7586eafa1a9c503ad97f1edb542 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 1 Jun 2018 01:53:54 +0200 Subject: [PATCH 126/153] cargo-edit: remove reference to ... it broke nixpkgs.tarball --- pkgs/tools/package-management/cargo-edit/cargo-edit.nix | 4 +++- pkgs/tools/package-management/cargo-edit/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix index c37ef373ac24..042c999be0df 100644 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -1,5 +1,7 @@ # Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone -with import {}; +{ pkgs }: + +with pkgs; let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 933d41278583..37f543b66b64 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, darwin, defaultCrateOverrides, fetchFromGitHub }: +{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }: -((import ./cargo-edit.nix).cargo_edit {}).override { +((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override { crateOverrides = defaultCrateOverrides // { cargo-edit = attrs: rec { name = "cargo-edit-${version}"; From b13c4e546542b2f599d8aa9d2b082ecf916479e6 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 31 May 2018 20:09:20 -0400 Subject: [PATCH 127/153] release: remove nix-repl nix-repl is not needed anymore because Nix 2.0 comes with repl already. Anyway nix-repl is broken right now on Hydra because Nix 1.11 is broken. https://hydra.nixos.org/build/74933091 --- pkgs/top-level/release.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b4eeef1f3def..f78152a8931c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -44,7 +44,6 @@ let jobs.git.x86_64-darwin jobs.go.x86_64-darwin jobs.mariadb.x86_64-darwin - jobs.nix-repl.x86_64-darwin jobs.nix.x86_64-darwin jobs.nox.x86_64-darwin jobs.nix-info.x86_64-darwin @@ -84,9 +83,6 @@ let jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.x86_64-darwin - # Many developers use nix-repl - jobs.nix-repl.x86_64-linux - jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.x86_64-linux jobs.nox.x86_64-darwin From 507d24a7def2bc16ee3034371c9851ef8ec8843a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jun 2018 02:50:37 +0200 Subject: [PATCH 128/153] signal-desktop: 1.11.0 -> 1.12.0 --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index b9c1c2a1db0a..da862b715147 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib, freetype, +{ stdenv, lib, fetchurl, dpkg, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev @@ -16,7 +16,7 @@ let gdk_pixbuf glib gnome3.gconf - gtk2 + gtk3 pango libX11 libXScrnSaver @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96"; + sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; From c97fcb4d2b08f31078459f113fd53fd89c107cd9 Mon Sep 17 00:00:00 2001 From: Anton Latukha Date: Fri, 1 Jun 2018 09:02:28 +0300 Subject: [PATCH 129/153] qbittorrent: 4.1.0 -> 4.1.1 (#41252) --- .../networking/p2p/qbittorrent/default.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index b2e9333beb3e..a5d861093c90 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,44 +1,47 @@ -{ stdenv, fetchurl, pkgconfig, which +{ stdenv, fetchFromGitHub, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging -, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) +, guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI }: -assert guiSupport -> (dbus_libs != null); +assert guiSupport -> (dbus != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.0"; + version = "4.1.1"; - src = fetchurl { - url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw"; + src = fetchFromGitHub { + owner = "qbittorrent"; + repo = "qbittorrent"; + rev = "release-${version}"; + sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf"; }; - nativeBuildInputs = [ pkgconfig which ]; + # NOTE: 2018-05-31: CMake is working but it is not officially supported + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus_libs; + ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - "--with-boost=${boost.dev}" - (if guiSupport then "" else "--disable-gui") - (if webuiSupport then "" else "--disable-webui") - ] ++ optional debugSupport "--enable-debug"; + "--with-boost=${boost.dev}" ] + ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ optional (!webuiSupport) "--disable-webui" + ++ optional debugSupport "--enable-debug"; enableParallelBuilding = true; meta = { - description = "Free Software alternative to µtorrent"; + description = "Featureful free software BitTorrent client"; homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ Anton-Latukha viric ]; }; } From 5662c243026bf5b14e8696fa4fe961589470d199 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 31 May 2018 00:12:23 +0000 Subject: [PATCH 130/153] qpid-cpp: fix build after #28029 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When -O2 from hardening does not redefine -O3 from CMake, the build fails with: src/qpid/broker/SelectorExpression.cpp: In member function ‘qpid::broker::Expression* qpid::broker::Parse::orExpression(qpid::broker::Tokeniser&)’: src/qpid/broker/SelectorExpression.cpp:1041:13: error: ‘*((void*)& s +17)’ may be used uninitialized in this function [-Werror=maybe-uninitialized] if (s[1]=='b' || s[1]=='B') { --- pkgs/servers/amqp/qpid-cpp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index a838fa3b904c..8446578507d8 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -35,8 +35,9 @@ let NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" - "-Wno-error=unused-function" "-Wno-error=int-in-bool-context" + "-Wno-error=maybe-uninitialized" + "-Wno-error=unused-function" ]; }; From 0385d69f878a4b9ce4d4735e28dff6ecf7b64507 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jun 2018 08:10:27 +0200 Subject: [PATCH 131/153] tests/containers-imperative: Include stdenvNoCC While building the container there are a few occasions where stdenvNoCC is used underneath. During the last staging merge, some change now tries to build texinfo during the test while building stdenvNoCC. With this change, I'm adding stdenvNoCC to the closure to make sure that even when we have future stdenv changes, it doesn't break (well, except if we do have another variation like stdenvNoCC that overrides stdenv). I haven't bisected the exact change, but I'd suspect that it could be one of the commits in #39457. This fixes the test and it no longer fails with the following error: error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6) builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1 cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed /run/current-system/sw/bin/nixos-container: failed to build initial container configuration Signed-off-by: aszlig Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer --- nixos/tests/containers-imperative.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index a548b17b1ff1..b89e08f82acb 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -22,7 +22,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; }; - in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; + in [ + pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path + pkgs.libxslt + ]; }; testScript = From 1bf2fe70a7a32a87fdf4cc75560eac572c10a6f7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 1 Jun 2018 10:00:43 +0800 Subject: [PATCH 132/153] firefox-devedition-bin: 61.0b9 -> 61.0b10 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 7b518e3714eb..82fa989a7bb3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b9"; + version = "61.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "75fb64c0c50503e92393c2294ad48c63abae225bcd88f9e5d3e681ee1e1d59d9100d672ba7440523ac0a365a5a6fb5ec08cc4bbc09c59ebaee33e826565c9a6f"; + sha512 = "740d588bf8c76fe5404b5c85c3fe684487d66737736df0a63257f2634dc09ba57d5dcaf6ff0bd2e143fde57f40c94785f7c544de63155540459b592923cdc825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "96a5aa4c1952144b8867f98b5fbc5b2f7e3707e0b6d1629310284a6099c28bd415ff16cac453beb91bdd7848d86e360907eb6cacb711e7dfea54d08b91fc09a2"; + sha512 = "364ca986f49c9264b82a22f8eb54d23238d4cf88dee75e793a05cba1cdf9dd43d961d563dc2601133ad82745f525af9620c20f2af0b61b846c9d11e6766cbf36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "e1a0ef6531a26db01cda6403d18c20d27f19a6f97d61c48441706d05ffae12de2e2b349ab709027dd9f2ef72f52343703feef372922120902f8a6f3479603dd3"; + sha512 = "071bac11250764e3d53b7254fa8f5e2d52e3ef848d540f8b1f8e1ab057b52ca3417018d2e92e86bf367d7c6c957b98acdb810677c39f1a20cb21e44f0fc00478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7dd862b547f4c996269a627f40b43445421af04f6043f4ba7904be3426ec1ef68d2fdc25e48825d2f078342f7481144fca1a64275ecbbe78a2d5c0c199a1110c"; + sha512 = "1317f10e8011304d00acbaca253aa8b6caac069878a93c11b4a81ce94ee86b13029a6610f771dfac165b4a15ccd89ebe4190abfb7db02efee4d8f97a561cb767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "1396ffecab2ef9a183f3faac009eb8cd94f4f3aec74a2a4f5c7d4cf84d4e70c157b4608ba1c5b48e01f6ac3563a567329ef3137bca9749a4694f815f01ee82cd"; + sha512 = "62178638fb5536efef88923ddd7c45ddd48f662ce33f838080ea04a4b31a12d0cdc0ea507873ca463eac17e4863ccd6a02430c7da97e2caefebbd4eb19efe842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f07e660a8e390fec025ba0ae12c86ed45aa39abf1cb168596fbf480a4a2bffa91cb667dc10beb75f3d9bf007669d63e6e93104b7276d12dfd1e0dade27269990"; + sha512 = "d8912103afa9795c9c96576e086e3ee88c12f060104a899f150ab07f1693cd11804fc1c080ba0a09137e58218ff765db854427913f8f1bc010fa9c010d721eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "715f4e1782c759d3578f9f57ba1912a47c1fea41f878432b999ec6b68906ffb794c1413f5372653e8b3119c16837d19351004323331c1b29012f14fc47be897f"; + sha512 = "9ce7b890d540ca77fc2190d0d396a00b300fabf170472980d127d874898ff16588679a1467a64da671417eb59dd1594d2837f00a3977bf497242d070fbec0ae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "e4b6e9357b45d56a985811e5b60ded4feed851981a3d39d013b43af70c6c83dc6dafd3c200a8ba945162923985b19960b6cbe54435c8d89fff1f36fe8fb42991"; + sha512 = "45488290c37219d05c804c953f98895245c401b2fd04ccd43e8c8ae8a91c6f55108c3b9ba3ef0d2866c15bd1a8791d76a01dd69fc79b30eebf6d1628c23f4bc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "1d9341f17b3d82e26bb79541cc87b189cf624557d5e59978fa2248640d9756b7ece0aa6c64a59ecca47c23f65ece8ca6bc3b2bd7e6ed6d09003e2b23265dd048"; + sha512 = "24eca3ce4fbaa3f0e476478b537bbc091f2afecac4d2841a2561b91c84a8b2f3c2e73c4e4d39bd0c7394b321ce85e3155ada433c4cdb7c0e12ba24b0034d55fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "8c187890d236e847e33d994635e2e3fbe3a8c4b5e6aed0e65ed41659bb02ca0aa72be2bf65a8bd73e5f786fc42032b659a36e0516bad2663e72a9bd18ed1aafc"; + sha512 = "274a9c2b0b2461aaeb8c951e8c197af5fdb0bc08ac97582940318e585fa89e9245a5424452cbd6664100e5061866242c12ba1b69b51a0764f76788ab3e65bbff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "94757d9cebe243e06c0e454b72b8898f0ca1c8ee5682529775c4b86b871fdec03041dd00ee048b7a875ae2f91d0b81f173d48576a16a1e03f240c74ed0c7afeb"; + sha512 = "3b2218b908dda94ef336c4b9f567f2c1b0f880a40d32ae9a3f0633eb448932ccae425636a43cc960a00790ad640e3355dd5b4ff385669e1f8fc3c17aedf72249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7b55fb596d76c18d8f6271b1b7d7fb8646abaa2e765f7a3ff428ee75ea6e23de662f77544c72fd1e1462ff7a633e3f244cda23388315488daa65e11ec35d95fd"; + sha512 = "81ce5b13a01746389ac8aa171d8724bef8c124c66984102cde0eed038f1b5a8da1c8ec6f67743ed8c949cbd54dc3aeff0beae09522cc9b348d17e1c96b2df354"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8f37addc81aa8283a489a5d1c4f756f7532429c661124c1294e00bffb8b313c43c0bdef0e4c0b7be05b3e1f306a7a77c44909cdd9030cb45d85e643f58cc8799"; + sha512 = "b76b7c5388e7bed9c7e78c404cc73b9514e739f750308019fc34ed7f67a5dbf6455079fe54886c31d1b517b1e5877062242bd8a0eaba50e4baba2f1e6c6b31a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "672eb7c624d0e574fc8028c4cd0877e17f77c540876c64f652c3531c1c1abff67c4408ea26bcec8b9a68212cf0e13f494c02d7aa63195c6f26d08b35bae556b4"; + sha512 = "6180796b52b2a1a918593e35da2732537f2d8657b48cf91541ba65c85908a4cac4c5a414ddef5a8f746bd4b8c1b7a09153be874b0bd4718979ee74dd45e61239"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2638169827de1a5ac36af21297695bb3883c755cd6995f02bd63375988253b9f925bf88a9aff03e942c8e0a4de0f5a7a9acfdf55a8c0ffcd4ad200152c051901"; + sha512 = "d642f89a303414819e66ea1d2e253d053b95e4b8d89ec90d617b36ce482556e835825159181a72cbdb48c40136f2c59e0851d4609ccc55b675fe5a6d06a54ae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "0e1e30e740c9a2ab4fc6121d929d21275b7007555a475f003fe64cc58c5f0c664b499b6361322c1c4f6f5b6bc3fc1de4b9cf21ffc15e9c0889cb00f3d12bceb8"; + sha512 = "4775eb724aa03c77fd36ec1969d43e27c80b829401417d687ec369794c3235a9ba99a30501a1d2c54806f94cab054b5e763c96591568089b8a78d590453212a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "71011db2d4a7b023c03f6c253662ae31301c0a8e0d66d769775094ae2dafe3e1b6723c30749e0a96a0a2e470100ed5aa58ca2b6b37ce41d3f06fb82e54a92f6e"; + sha512 = "8a629ae7e2c9f2376d9846d6713e049f227ba251caafde55aaeac062e738ce26c75480c730a7d4332dc63c4d3eacf240396f5c7db657e9a6dfcb45a3e6c7400f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "af01926560242286366d3abfcb499eec06ddbd3cd07d6789489145e06b5689969bd6e80be15f457ba3f36009c15097ba56dbe9ccf91d61913db3bd563a0167be"; + sha512 = "b814806fc1b7f26c2c10d973db25b159ff49834a75afa1fc6e24fcb9b08bb3899269a4383cc675dd117f9846d4a3b5e530aed3c37e8ab4b65ac21c00bf2478cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8bb69b0557a110331472e8d85f5978713e7e3824342225fcee2dad27f248f8568175339e2e9dcaab216009c3f71e905a79c5efbf4910e337b040eb43e83bc887"; + sha512 = "4caf961bf706b616cb877b713b9d199ae8f518a69a608213f1d26ee43a141ada3a4ead80595203314818adf45a21ffd5a4a92402aece9c215d85316ee1eca528"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7e6839670e1024bcc9124baa6072ac9381885ed979903c4eecce2234baeb471c64a445d2fd5085cce05c27b134792530dfa8a971863f67e38ddd3dca7ac90e50"; + sha512 = "8b18c3e4d16f4400c10541a2c7ad31cd21cd5709e352d9db1116aceb3c0adf36e5ee69fb35a02c69e864b2d8ef8c977531df1176dc0530e3f5655609dddc7c78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c392024823653a78d3e7e47eaa522e6b2e465e3caf9e1e3dff1c1bb3a15e48176c616c9f8daba332254e6efea4c9425cc8bfef75a0eefafe9485cb8e18bb807c"; + sha512 = "6796cfda6591d705c4ccfd10a082a27dad9395191bf18ca8d721fcd37c82d7769abef341b5f1e87de0e2fd73333e61480d0f70ab4e796a7e333c407cc38291b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "316c9fefc7fac7b1013e0f0e32633ceb3125b5d8865d0ee8b8db7283c5d18c28dc85de57b25fbb15d569b907690b49e4351da2b9fa5116e910aba1375bf1d4be"; + sha512 = "48c7fb0a44b65a6e5e8a7021525a5101fbc4727c43b28d8e1167996214c4c25f933e28c14f40d6c68a4a46aafe21a7f87375eb6a191c7edd8458fe4ec726c55e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "30aa0f0329f76b52fafc22332cbf6e278c0cca5507cc2a806e7fb78969a203e8b7c1b89ef029a38bb3da8b78f11fcba4b7c6c1fed0cedca6031fa080cebf1ee4"; + sha512 = "92a77caf98ad017193bd2989e9a83b59c802563503e1d84d48ab4bb6358437b31d89ea51d85ad4c97025f8db9da3245b2dfb51b76e81b11f2fa39ba859cd622b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "86a2fa792c357040a006e6558864a417dd973464231197857e05e17a5b2abf2299811fd4c2cd21de5979de5631017d7057f675b05820198d4e1dbe3b89432fea"; + sha512 = "9a912d19b5ba481b59999f619ad0f1588bfe00adffaeda2004d600a5f1490a7013137b6a66167e0e228350265a0aef08a98b76920bae15ff4b3fee2532e3de33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "350feffc864f163595c24540e23f8d8e81bf25e8a353f344ca3fdac6b80e0b4646287232332310d10b87b1fe64a2cbecfad24752200a1aa05d25b0a00fc0c698"; + sha512 = "8ad7db7437357ed0041d5b08a0ebf70e35b58c0eb66105700a473a7231d560915a775e90be2be9b7e776836d01e86ae08210f454efeb7e0e99594fe53353252f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "2a735cbdd073ef00cdfb1b37134c7959faae380f69533dd46ebc67e1644990452e8e55d643e41f1b61d600a8ffd200cf26c9952d08130f50b2d0557c19fbc710"; + sha512 = "266d24efcaeac7a06eeefa7657ebd9a3e33f79726890cc1c8b929c7a0dab38d761ef4cbd5514444540e58b8f2718f0a4bed832985bf2ce5d2929d6c695a7de91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "69d6dfcd9426970681864dbc81e092c5a00a1360401bb641863f07acc6fc11450a62a7ddcc1799eb290f07cdfcf98ed713be84e9ef13b4257594a7511d922ab0"; + sha512 = "3188079a0ef7845a6157d887470d11dfa700e17f3a85012a4138529b7e21f44ed4034814338c4e231b2023131686984f86cf938ad2c437607659e971f45bc96e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e46e6871499bab27d57d37cce001abf97646c841321b4e1fe9d05fc1e1b2282077c7fdcdcdc53869322b7b6c0ded791a092020a16cf82152551240c0415fa2ff"; + sha512 = "58979c9e00b285c61fa1ac30f0414aeedbc30185542e49615f943a1a7eec8a92be30726b090d275fe21e6bb7ed0103eb0e02e4d9043cfbb8752769ca9e20e5cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "20ac9ff086c905f8b46abc959909495faaebeb09ae125c9f0ec0c75d41a2eba9d661a2a3b1f21b061f7d148784129a43fe5e39cd1daced601f02ebe1d8980743"; + sha512 = "182fa29867ce9a6c2f7906f3b81bd5e0ba33c6b8802330d3af27ff0dab863ff95575e72f3388cbf4aa1ab5e8a10e0cbcaffa4ed4873e2f1dd3f20233a3dc316d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1bf54cac4cd8e3b640357897af7a3eb15e082d24950fac0243006f2e402a67137cf17ab927c287a600ab6a13f803073d47168be6fce85f4910c751ff9d772ceb"; + sha512 = "103fdd39cad73c256a76719b9f1bfe56b0f0ce9a888b63378a56968e01321e27dffb113e9580ab96756a8a8d397560b49ba69a42887dbc9cb2ab520583ec32c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4201780fb972013086b454028bb42b32ae8b8519952272a129045e557c8f8f377eb4c6b12d59a8cdac23fb49250cc6bd3a0f9aeb8b14eafebb48bb34310baafe"; + sha512 = "44f11cabfed645db051ac0e74d416de36832124cd906d5d5743317ff216fb52e9300df3653ab48daf3d5206783c97ede183bd836212774130966241ec7819a29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d371143546311601cc3177f327211c9e67bf57156dfb7ad3d9664ac11f45e3c0461acd64ff8f445a106f904773d8734b498993978e8c6fd14f8572cfc8a514de"; + sha512 = "c06676d1b349575ec4da0e7afe8f50bb9f5176d417d5291fbc3772176a0510f1b512d62f7f7e6377d5a886179deff4a48b4844550fb8fd1bf7d2cd110e16b916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "72b8e0ada0e725f9dfc5727b55a0efee0acbfc5837bdc5ce6b7b9fbca4bbca59852f00df3b983dc70e233a2c4e643aa0e066830934965c63427a19da8fbba0de"; + sha512 = "85503ac496efc98e642a12e2c7000704424ab69e01657d1db57e2af72365517d9c403bea05cd740ef5795838bab60992d23dd6727105e1e8e9952abe4eecd97a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "30394db6c85ddc94f21a49c41b6b9e26b77ffda48061c53abefb114c85dbe09bac1f6f2f40f83a719b98ae673936a4bbc90b3f74d399b50b0e98f50faddda1e8"; + sha512 = "669c6fade9300b3918b4f72bd79984eeba9c56f8e4010c062ec733c85b201ef152543cd42dc7c448ea4035672d314ee90ead6dab0f055763f9637a0dbaaf5dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6fb78971dcc3fe3ac5f52809c217b893678d80f33b712c9f9afe0d133aaac6a02d446becbc3bf533a8913aa272ab6bcdb9a21a884227b609e8fd0a4ee419b2c0"; + sha512 = "b4de90e91c977cf7005b44926283831d4f338de06513cb09304eea1ec6ec3b7891e0fea48c48b7933ad5cf5ec571f3b36dfadc5066b9412be5b084eb705e8359"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bf92a74774aaa365fa7e4630e0543ac017a4d4692df25282fa7763bcf2afae2824ba8147d9f1b33cc8ba1c7b2ecbb6edf6c00e9e13edeb669900a58a8dd3d839"; + sha512 = "e37e4d7be6f4f8f66a18d17c35822ba82b68a3004c4007a0e7bebec19900d948870293586fb9d8f27b4c974bc40f7d305545d920bddd22b9e4bf592debbda23c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ae835b5886193657584754244f0fa3ffb93b1e0efe3fea4e56e0633e867a8772fe0b1bd2a49d5d26cbab03bfd4f2c8c14090de91e286624917637ba50838fb3d"; + sha512 = "4423d01af6bafacbe8128933ea27a43cb9d93a9e22edadacbe39131bed9ebb23fb22d6bc1ec6e9ce648cd4eb6bac72d8a58afc476fb2222542a4d81d183d344b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "53cc4518af97928f836c4427ff22ce60325682705a6941ced6fab32cf1aa1814e7d295a7b1cb7d389bb1fc8f2a691fb178f9ddff5d69ddb377e282f2f2e07171"; + sha512 = "e19cbd917c6e3822804a5176dfe2bf345744a8f9a65e9c201fd34e610cf6fc8ca8c85a0309126025647fd0a251ca2b360e420541d83f0a66c9ee5001d46db916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "eb3b1d9c6565864bb870a6d98f303a749afcfcc66b619ec85c5babb3e93ad26fc1a4054159c75f3f6e400da3538499f2f26abe65ab1a01a68c7ce85be70be935"; + sha512 = "bea38f7c3f9d79ce5dbe1a10c118497f110acd9c346fc24d377757cf28b35676f9df2fc7902f431feec1177f67465dd6d57a349209463e39514e4962f93d108a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "23e34458f7776d192271eb29d6d06072753b16b929cb3efdd9d9fdd741625a650d407e51ee6f2f5415bd60392872aed7de231419c1cb32d5d45ba7435a445ae5"; + sha512 = "cd21d480fac0cbd1f06896c778d8dec99f5355944f5ef976522d4d893a6b68243b858ac64ef96fd69d3699cb6bec70368268991654d4119172862a7aed99f91c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7f7b8993077ff366c9153d732f6c294400d0fd887bace7c35dfc056d0f3171eeb465f599cff802f9d73873d77d10deaa423762ddb0a469f98ef79e1bb512312f"; + sha512 = "f2374262b10dad0c20fc0e8700df88ebdd6cfadd2075ff66172007d953012038443964fc359f6266f0c02c6bcf4050549095bb5beee26efc23731049b4faed00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5678f36bf759bbe510914cd522309c43d4f346e3386261bcac77e0e6101f0fa88dda99b38dc54f0d28aad73f4c233758d297758816b5601806e578a288fc9918"; + sha512 = "7e2f13ff348c23e3f64e18619f0c39d1bbd57edba2ee22c2c50b1c03014f658be9b7c4ad15563286f87786d87fe983e607a70c338a6e906321c0ae321c521647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "89d448c4967e611bd90936499c83003744a1c505ed5f282cbcdb37f10655d75793992328237e3d08054d9e14c42755cd1bda8d60bb3432f85be5d55fca499e3a"; + sha512 = "64b1fbb4fd1def6819bc42eb55df6e88623e94028517ee57dae350c63943927e455805463b5f2afb144c3ba8387e192df2f4355755f402dfaa2dc02c2ffa6570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "28504ecdb7c0f2a76ba5d2dc257b5e8f4dd31bc93b341ad2db987ffa59685f67f04d4550118259869052ff2943acf97efc356e0b117af7dd78969af731edc538"; + sha512 = "2f7d0ccd6ece526b82c03aa9af1908c976fe1b8bac37c6403a9162a6fcbe0fceb9f12e40cfa9877dd57df77adb9104511b0da1efe4c81690043b7718a4dd70d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7d04bb5f3f4b00d43c20406f1d1fc2945855edc9280ded91a41f0deb9c5ef348cd3a3b440619cce67117cffec88e408426c25024248da4540413d660c1287008"; + sha512 = "72b9b8b82743d2d0ed4299423ca02e17d8e4d8415bbcaa9d09841bfb45889b391b15bc21dbf13ed96582253190d49ac876e1bda6c0758e9d5d0f16f815f3c036"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1702ef8af27cdbf85a331cce97f640c50f03ef0eb9f8a3dfc33308138ec9a9a255c1997666772a732ebb197f8dec1eddf0d84184b717b8ecb1bbd373df551a69"; + sha512 = "59e84fb28fe39c686d648f7cfd49341f66a0823941f4d9d14f8f310f9192a2cb3bc23bb54e12415633976e82184b8350f43839cc9734ba203259b8fc0f179ae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "65a9c00c3ade5acff7fc8f325be456d876a2595ae7cbfb37afea8d6ab9a941bddeb23ed8e06722d8ea05260d48a77a7f77fc69748c5255c1f7f0955068e04c90"; + sha512 = "003df5c384d23d3555e9b0d92720243f9e3df290367b332d251a2c4b3832c426d4cf09d5e00eb1e738e9d155aa457c1e5e6b2b3fda4ae429d14bdef774fbe78a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "bed9ddd51fc5bf8d5e12ae8964901696002a047fd3bc33ef52bad2253f13307db518ebdf0218816a7e0fc184f8ec2c697270d71e30337647634e9b993169c13f"; + sha512 = "5d0b187b3fa398785c0c4d5901eb3e9d095668a962187a396e634dc2e90c46e6c352e1ccde962f77748a8f97292b1419ab7e09c23cdfd56e3ae0f1842abf0cb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3a5bace1ff0ca4ca7af8cf93dab07a88e869f678c0e1f173bb26d5ffa44ac25af35dafe6840a4132cce59a528b07f307d03d4e7886dfa4eaa47323374d129786"; + sha512 = "78b44c4aacc812973258ae941ee30fb9d325af19ee2b373cd6aa746e20a940bc2989e50ed67b35f62336f30ea81d66f18d55c44b6ed169360cbcb08b609245e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ae9257f6e9423bf71ee51c645d41c48583a5b4b0c2c76517c1edb4fdea2e109ee5562d7ec35097e558cbd46e1a929f215113390c04991e18f3cd26ecd7d8e87e"; + sha512 = "bc0ec077b4d2f736e9644b8332563790d0baae85e90d7f02326bb9056124b4a63066d347be524288d51cd213cd92ee3ff4f8c63e88c2345f6c3c2e2789251405"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "24f39efc482e1051ad934259b47a79702f1232d1be308fefc06a0c80eea4195ebad7ac195303b646b52cd385c27ca7e3a8f9053e2e0487d337443ba61794176b"; + sha512 = "97516d02b2693972ca54c979990bc66405cf565e4ac6d544352a9da3cdfe9abbb1ae74ffe0b71fe71b1f0a88760ed0f7ce9cfe12f3fb3e226ed0e0ec7ed053f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a9ccd225ebfd6d4d4975a4ee731935f7bb7b16f23c6e2f23b7939b5348e6f8a6a3b11fd683b579d93d9caf826acf50a3a12116d8e4cdb91aa8ca908ef2c9c72a"; + sha512 = "20fec5b84817ff92c773746364c4abb184d31db34f75c4ae8f88410180a59daff8f39d1ce865b964dbac47f2866dfba6c4b24756ccb2a693e7f0cf13100e5f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e8b4f18dd35ecfeb4840c955a067376defa72c609e853f48c1c2e8e364e367477f08cc63ab02f8e7449c00bc45df3c6d6e8ac48762c425217c3ba3eb9ab68a7e"; + sha512 = "511f05631702d1a4d8c82b848e2919cf1102d88e0965ec17b14451543b0d91e1ca542bf455cffc1013a531f6a4ff13410a082efcd996cd491daf4d6b271151dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a624c332fcb259401de7a5e6a6e9412ca76d861010f150e3b68b6913e3b4a2493c51bd4c584533ec6c10c84c5801d874519feaf6da4266797ec27ab532157e9d"; + sha512 = "bd3a639c0377454098b70394fe1088d971fbd8be65eecc6d5076e7450a6a5092ab09ee3459c8efb2a34430889950b480e4863938e7c2862ce28a98a393e10aa1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "12bdcd149cbe8eec06956dc101b55fe45b938b92131ce5b11a7c8581c019932199f7ddd2f510c2015c800a226dd98650509616839776452c535f48d22b5486d4"; + sha512 = "52050b3ebfe363d0fe34fe6ca27fa67f6b32f809e508e6df5c99239769ffd8d8272fa177f8187c53a45dc59533d5b54c5c9957ef177208d6f3af9316938c266f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "856123aa5a7fc476f74fd959cca25099c1de9cadf2b7f15b0f7c850d5399a337f8ee0d944b649e0bad3107b8fb52cf46fd887e4418e7fd8f148f95d86f3fad02"; + sha512 = "84eec5c1740d64edf90df6ad363e6782821b665bf058b42373b5497daae22ff4ab99f4c3ac505f9254b0acf814dbcbd4588f55ea18af74cc71b1b54880f83f14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3a3f20b713d1d9a49de9c7309231e75755132495b105b19f5bb2361c5ceb82166c715bbc0b74094cbf81a1e451cdbe648a19b81a3d68cb73d495540f95e54432"; + sha512 = "152cdfd619bf6c7f01837b7b0837d2e5ae1293d10045feaf96d8fe1dc6bfb290d4ab60ba8a2ee13eab4fde952740c67f587b010adcce5e7ef34b3b9c5e91f161"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "bbb64dcd8afb5af7c7d3dae71321f39be97fa9d20b92ab8158383687c1dbed5e71fd4e5bebb29bebb1b14de3027410f595a240c472c9eef9cf009c1ebfa93773"; + sha512 = "fd87cf3b849387194cf632429ae73fd3e2791d39abf341924606a834403ffdd4637addfeb6fe65660a8de533f1b46d71bbcad5a9ac8e779b439658c6a2586bf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "5808ef41ea5aab9ca5333855271fb6c72cd776009c4827997211ed1216eae9cb1455871dd14c0bbafdd095c7c68d569b708a67f6004754ae7ba24da05e31b322"; + sha512 = "ae57d2327a143edce6f1b459b3c0a1120904cb6e319a7f1c02bf221908d6ba56ee72b0223ae9d9e409b303be56d2162d1aeb46472870b9992ebabcdcc7579bbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ce54d32adbfe12ae70b982bf8a98174dec1bd34c3d98e0f5092d2b19ca09dc3a13a1ae4f62ce52829cca764210bf9095e0f535d4a05972fbd67a49b00213c200"; + sha512 = "0f6afd4c33925472269070d7152b13132c76bbe489a8561db8a760d766df7a71f60bf23a1e60ff3aa6f22697eed1b64d079b14a4a5919c12cebbd87a5c21e034"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9abd019bea5f3b27bbc04af20bc7d0b47da91348d143fcaf4fe946c1e368373d0e5df1bf252d65fe341c767e52420ebf86ef5ff40ba9ebcc05880de6642ac865"; + sha512 = "6966b2f4874e12091679daa53b0da6a25a4190a251475cc14858d3879031c3b806d1d7cb37f851bc3d5da5f698cf4cf8a3cbb1bb365c060e7bb66c5d21c7f113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "446754bac17853bb1cbd79a8e9ea988e4795ee35c92020218b5f2fababaa7931918cda588ffaef75913b33e7546f141ebb578914a9fb1ef4c672e02df1abe51b"; + sha512 = "c52d814873cee8e11da15e30dea3ad85dbd6fe97262bc32ff246747301026b543927dee712d9a9bca480d5980f7753f3ab50ca01316524ad9b6bfe2e53476c01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a1323b05df4856259e6198c81887e0d1b4f7b2b25d8ed14da52f80fa09b9fd62d6bc49af4ab90ec54b866316786de330021a1877aaa9f8863017e5537bf06e14"; + sha512 = "a794ac4ac3943e92a5d7ba56e4ddcf9ab803b41184c3fc3926b6bd0121d35d0061c70a10bbfa41fda26ea7ff445013358f7d842171235c01fafce2c30af2ac32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "07d4707a71e55f27b9ab931026b42476bb1facffb9998523ffdc7b6d6acbecb8f9bf0c1fb90a7eaadc136b374c9d1a7c8df6a52011efffc924cadfd6a1596bd0"; + sha512 = "3cb7e29291a68bdaf5b57a8604b82bbac54af93867e8452b5b61515e3d7220c67acc09beacbf28e780e5aadabc24eb2c2371ff76aad8be6a836ab76712c40e2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "add2dcb55bc2da5691b497610bd87f9adc7a67a7e1de04acf21562aedd5fd71a1fe3f70b69098807b3d85b6cfe3cb91676c6297b9ffde7707e7d3178e2abebaf"; + sha512 = "355578a744644fd928d8f470a95573ff566db162fa4521beed09cc84d6c7b19509633ac48faa9e80c58cbdc4d781f5ca0155a986323b68ee7c7a968325af903c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "352ada2093c4e8eb6964d053fb61c3d971d296377505775c72feff02811f1ba4cd7f9fa955f413c809205e68d1ff05be0189873b8a0664a440d2102275061936"; + sha512 = "c91c9a810686a8d8e96d13109272b8cbae5dfa6cdc9b9a064ad9c5eef98e5b47916074c79958d7faa18a8d6c9498482dc1eeda531caf2ebe4c5b1ba9059017f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c0553541ab4fade9c7b2a5957b24ee7fc415cb6071ca2fa94b74e3b31806ad340f5e75565a6c1a6c25353d2a1e2375e3d954f5f3bd076fc4eb75f71e58ec26bc"; + sha512 = "c25b9f13da2fd1ec67c09dac800da0bfcf103f08161957bdfeb49a0d538f7d3a4811dcaaea3f86b6d166c440094edd31a540eaeb92d668f4195d3db4f25e7da2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e94f4f77b29b15018333c2aad853aaea2ddb360a5dbfbd0bf8b10fbc57f6b3e8c241b34e72df38873157bd46bfb2c95c25a1ccf2946aa24dffd1920d913ea763"; + sha512 = "e7713c599199f31ab6fe553e13d165918ea95e2ed5b128eef9fbddcb0ca102e7f9fe0787f3aae61a4ebda37d52d106d997f5819b7a74064875b555b6351ffcdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f41df5a5212e906a5ced3b4d7193ce84df9a38bfb8da3f0a6603bf22bfd4ddbd1c357ddc7429b6103d063634127104b56b55db9692a3af65c848227d7e825f5a"; + sha512 = "23d0756367a3e68e85bba22fdef2d117dd9d5d20321a0222c783d0846a73f00439477129d70e7515071a3439800fc22f3074ac3fcf55c7642133601ad3ac6ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6baef38f5722497fb5e576785d788e23e51fed88ea49ecbf47d8f9abb5b497e2921f51ebbd1e9111becced65dfadae2e84ac4f01bcb0cfd8a6fb017a51b81604"; + sha512 = "2584249a71274d4ba69436c423f75a84ac993e50b87fc4d3a113bf70ea2a48a86dfb201b3f06bd19ed3d5ae5e7aa5c3025c56905c8a0255550c0816f17badaf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4af7b502e8447acebc362adb703516b77dbb3388b8656a2cb41cc4f63d303533c038e1fc24b97d2d45ba81f5bb1bdd9880568943166da0b7bff458a8921068c4"; + sha512 = "dc909b3f7ee3641c7d0250a9d0ef5ee2b0e89c1e4e70e81befd4dd2ddf33557cd52f2e7aff4dc469c4b9eff105cdfdb97eb06b7920a6253a089cede1914b2c80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3cbab81d47d46ceb78df4b133c960192eaa34d4fe936872a29dfd9985d8561266c3bca7aec9c6d142cbadac165ff3729632036a028462b583c1a55f4e0510687"; + sha512 = "5a00f883379d38b67f21af9089658bad971eaa5b16cb410cd3d9db601d050cd464e6a6413380e26a9a7f46bba7241bb16a29a55c7d08255b39017d2cbdf945bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "22ef57941c62010d0874b1b12d8f0c6d6c03f3123a05e32fcf88ab0c53f127daad70bc16c2ad14c5c157f4a71db53ed1e04869f3cc76f4a4a3ffc69f0879dbb7"; + sha512 = "4b9a8fc2d63a333efa3d2e8d5fa40378b2a58d1165438fc924024ba3f8c0d5716cb75738ba2b18b9673453a2cdabf2c506a645560effc68bbfc7d4efc1cc205a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "85accf8c383738df43dfc26c3258502fda0ed2659bddb0fafd666894324d2d1503df06783d3d317e29898a1254d4f05b945f0882b37f4e58012f57473a3ebfe8"; + sha512 = "e6411b8f71b597da9c1e4a5c8cc6c2c61f99319f46792145b675724bd3dbde8de9dfbb9b59fa004d5e4140df77929da2a9defe32dca321d5054b36bf90afc03c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a6bfea30bdf8b9db4ddbb9bf1dc66ae351e4bc616ce287859af78e56a1babfe027384161f33a9db144d326532706029c1a2bc8a5369db62a645872c1b36c10e3"; + sha512 = "87542203f11fa3b32b7ca203bcdfae1e08e4fea191d5e17764221a5758f45dc161b4c6d5aab5e295aaeb679d0fc9278a5a578f35bf7390ae5b2c71caa37275a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9d20c00c9decbf3e57ef6266ac45fc8762ae527b642fb000b3b580b304f9b90fe7b226f420ac3de6ebdf4e2381edf1c17b0a18153e39eca29d34d849cab5a63b"; + sha512 = "a7812a6e6939ed9e80251f1c3b3882ed61769f63fb3cb967cedfbcf43a46a99fdcf01254b252d4a5a770d17eac622de3ec44a0b235426aee3e0d0f9eaa45d9e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "92fdf84fd3a98dc2c3da6267cd6d794d111cf8e9a99c9a7f2e703ec85702238e5486c28bc17415eed57053934fa17ab0c38269bcc72a3196b340ac1841af5d85"; + sha512 = "539f9969af49633ea8d9b2ff245815147dd792ac649a6858173eaf2be65c97d40c62d1c597a604eb7f54dc8f7f4fd4566ad6e907b7d99ecd2ea6eb052f7ecc8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "7dfa630b451ef91b85990a611b3e4f8a0e998efbe8b1cb4838cd50fb08d5fa64f53197ba7bf6b64b6223fc9739987a75966a1acad83a94743a18274ac1584ed6"; + sha512 = "0a905984476a7bd951deb5a4000d5323963e2431ddd9d13ba20c14ff62c04031677bd5545a7e07037146bb239541ebb2e9bdf0765d3ee0dd2f809b6cfbdaad4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1db4df7de8906f3a702ef3e205144ea6e090b2b649d82037393dbb58f998987a11517b51af124af3ddc2402241d846d9eea9556f9d976a9de323af23ccd43a24"; + sha512 = "9797b3e7aec8b30629474b4e55261bb15bfcc3a482823076b1e9618a5fc1b198f31270c085e8e28e5e69c5e5b05de91eb3cf6bc2e5e90aba9bcfb1a07d60c131"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2cfe54d682547355c384f46f60bdce9629db039842084f7b9b3dbb1eb65769b8531c41f41bc23da63af9b9fa2c69ee987ba362baa7541f7a09d6e77a1dcee024"; + sha512 = "3f52823ddd0ab6eb63f8b75ced6d1bd1e398be1d4067f574e9ec9f95f51dc0b6d13f7f611ef38351fa746ca0e2cb3fe4f3518ff6d250bc97f5c5845453022a9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "fc2ad8db7c8eb65f1506d066001b33bd7412b711adec7f35edeeaf25bc8ef9b9c9b8ba77e5941366aab63ff2c45587d09cbd576f455f076cc6e0d3eb034ce21d"; + sha512 = "d1d5be36226929132f4f6ffbe462628fa5fb0a11c1680243ee1c0b8498a0d00c8cae56a7dfb502136e5c84e4e109fec7a5cd673fccaec444ff2a2503f2d2b421"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8ee88dfe9d8457e0414dd8252487d7757ad62d6e16ab3dc44ef05f4d83948e6db714b1160208a9953f7b71b3bc2f5efeace559d9db956bf0d1fb70b9943846b7"; + sha512 = "bb846e1ed5a7fe60d00f456e3de91e5335b33c98835dcb0348002c80dcb0ca1e1f0d2f0ec0dd6f8cb5a57154f5203166aafb393681d21611311cd9479a7b2c7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "975a8a5eece45ce927fb6bdc7179ef0e9b9a6ac568f924c6892310fcd67f6edc6ad1ddfb10776b375ee70eb538ae84da531e3b98d04c856987b9f04d75d2519f"; + sha512 = "0dc8cb7ca47985e32eec0985079808abfe8b1750dd91b6d13bd7b8441b344b2602467be9fa1fc2626a1eac37ecf98ccbbebd626287b4d11902b85effd0730415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "8a7832f815843c46c1333ada75d2db3745ea300f6999478e95fee23b5824fa0d7aba7a51b7bd36c75ebbcbd2c0f59182bedd2f7e1b5c73239915f12905da12b1"; + sha512 = "4ac8d5e87c60775776da837f28a7b9b0ef33e73bb1589d1b8dee8a682df922c4612fc72c0027ca00e23eb68305a396e60c1baefe6b478271f5634560bc6cf3c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4f184c5310ee496f9f321badec736d7849511f6b3d5c95cfa82f927c79c69a3c120f708ebd3d055fcaef30c8ef5e38e4511c029f13e6a7b187fb2ed650e3a754"; + sha512 = "e6c552b445034743158bd9276d9abf4867d76a3c1d88d08fc48c304f4ac6e174e6e0b51e6a7539265fd5d0ca1ad6c2c097b7b169d9d865407e5963dd9b2da01b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9615f2b72aed205eaa41ea211fc96253a3a13f4086a95eef976f2211fb238c0ec713f825928935c0fd45c327759e23e54ad6061f061f349f49046f630f37a2db"; + sha512 = "019ac2eacd87fdea52e28cb48f79ae85d2fe022a86398751c5b30a7c069f9f3ea3a6ee74577ab0984c02bdf79bfd35dcc70f6e2d3bb5bbf4f767befdd0803df7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2fc015bb42a9ac9a0d2778ad2d9b4b05ea42e51fcee85d139c035e7115a29649eeee1b9f283cc96c6df701765504da31ca6cc96c20248f493da44a0c7ebfb5a6"; + sha512 = "1fa8bbf9741e517a944f08c484ccabc0994ac7b72fba3fbada9cc071e23c1381c86f890e2d7421a2aa2804bca599901215f7aca3e14608572e78b69b2540c58f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "2b9d9b78d691cdfde7da5ef55d45a535081d9e548aa861fd6b71999602b9599b2c1d06f554049b967136f39ec1995339bbae7a4878fb208a071072e68e15b633"; + sha512 = "fd5d13d75e9a57bb1b49086a8c2cb4428ebe26f7c082c34fb84ec89311a939f17fea415a28e43922d8b03faacf8f9b06c9d3d53d89ef9a6f16ba23709599bf36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0b12221b03ab876994901901f2838a18ed6936ad5e31ca47dcc0aff2c1963a1fd5b2874e01c69808acd7adf44fb5a653c537b433178ba38b4db7c45192fb4248"; + sha512 = "1d7833808bfb87e47c126e94fde2fc65934f3bdf8ed7ae658e4dffa18150da6f61f444591df4e6ebda40cbf79e193ccca1bc799707cf0b9386b14381a75e6147"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "027bf7acc4a0b95378dc2eb4ceec31a15dabae2a6870489ecba858b9009dda05442f9958646e113c7ad8c669ccf185fe6674e971ea1e3e1e37f0a6ad630ee4ce"; + sha512 = "19b8a299ca06060cf194da9f7c454bc569567e9e94ad752f1d8307929f29c3add0fa9af26a1dc528bcd083e8f5b4734da4431c263ce8f4fcad02926e4a6c7f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f8e385ba8269763b48a4a5455c8d96b2237f2a71744c5dea2969f95896d18e1108a1025606a4ade56aea0dca397228bfc08c60e0fff954831fd92d288bee7b6f"; + sha512 = "7239236aab73b17299151e3c37a4eabf108ae0d6cc336ea3a02809c09daeee3ec403187560c975d25c5c270ce31a58e2cbc09a780cd281b35ca9362ace7ae42a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4d3a0ec7f4e03bcfb2c04020fc3775c08da0ff2f727cd5e5e4132f6d99336bf8ab5a79c6a863a0bf027da81b13de45aa203fb10f7c8c38dd087e7953c4d7561d"; + sha512 = "033d95f4400f3005bad243c2e7ad87d20bde5bb4f2ea0b4c75fd1b1d0bf558b4efb811494617821f1d3128be18856e906bfd5e2debe658f4b28cebbc9fe505f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "da9e0a98bb3c0b791831aee8f688f1e525141be609ab4b3a65136a6bfd41c2aab220675540429231b6a63636ffd0f9333732dc4c0cbfd21b08dba92de9edb755"; + sha512 = "ae98df054497fc8c9507a73cd7fab6beec9447802851c718f6d6c13b00e05593a1f324cb7d7d6aaf1528208f3f55d0313caaf6ff4a16448d138421e19f54dcf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3712d5d80364978d28d49eb47a8e7a25a0d085a11826b4aeeab16636c4d277c45839d65afebe3ccc94afdd305ac76b0c5c508ce2208633eca89367600ba623d3"; + sha512 = "2e7e27351f909170c06454930d5a050203d59171d8ad3879bb27bc6232740078626ba726b307bb0634eca025ef094b1935c1867b37f68dde8bd61ff0ccfb0c77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0d6fe8b3b05fc42e2e6abcdd88d127bf4d45d60984386fb6d6d8ed3dddc9b8423977aa04c189162a20fbe72518a2d5cc4474aa4f71fd8ff5a3039b42fc6ff62f"; + sha512 = "a9eb501ebcfbb306a98c8f04787a7e04463025614dc484bc94c124e2d56df648fc7ca882e6462896623acc5a1a6521dcca7310da08899da207b8c9443cc8f59c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b83af193af0813f5e820ee5abab820f18b5e037f767729fd8a7c332f6e921a0a684813dd3e489e95d7ed24ae252f95149771aa5929f42e37f97d1e35e7746bb1"; + sha512 = "90f83bbf142d5c2829f45bb1db915a64e05e1c08df0299e80c447f71590a815f8a2f197f035ffea7a9515626a905211b8de9597d24c12ca4fc38b1bff2482b06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c63b6893b8926eedf6289bf2c8dac0f3a8fd5d069f34a9159efe0decb1b2ba825d4e9adc646a28acd555f9d68f65def8cd1f80f2faa1f973f4a9629817e3ecce"; + sha512 = "08732a0043ca0d2cc98eb60ea8a90a9c43450b09369800e279f2fbae3efe765afd320a1d031854129916389037f6d7e2c64188ff777deed9c4f7c33c3aaf7b69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c9dc03480201e6030b2d0016e25d3b1044b1718d40f58def0aaf8e646c0061e737ee1aee317d17aee4ae98624b09cca2c2dbcf0c70a85b97652a443666881b76"; + sha512 = "7b25a828a7f25e231f8133025a66cd2c2fcb4ee9141471ecb925dfc919915905763a2c61dc95cf4ddcd451e8690a27c0dc177f29ec6e1024b6c8965d36f68df0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b9954501ed8d449079263a14b481aa2c20f151590377f3519d919ff6bb493d982b7bfba3279d37d2627d96d3d83c4a68bf6affe4d5e486d47b22d1f5391b1348"; + sha512 = "1c425b2a712b815c592f0b051865d8b4879f9d55908945a43fdde6687caa5383a196d28283c6d66dc5e7344018dd5cf5761d1c3d566a8a4cba146d6b24b121a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5b8fd0240dbbfe10e866f84275591612fb568281c0d6b28573fcd39514b31a3c4a83fd5a710fee8d7a13be5ad1ab95048cf4915f3643d7a438c8f22f1738f6e0"; + sha512 = "1da13350d4e51e717f363c0ac8ec9d0e7c064e52f5142006e1c59f265ea1039edccbb3fe46877b1d08ed1beaaaf3960d9a060da91da0e57c887c2861aaeff641"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "07d49cc079c37e6bba667d27f8bea54edd04b94159f5d4dced279323ce0d400f76e2e31eebfbf7e13db184f299ea9c47068745e01f9a43a704effd79448b93ca"; + sha512 = "d0191fe2db7122058c18e77e8689426f01011ddf4360a53d523b8415e6ead69fafcc5c987d8afa11b891b16bf822f456195433ef45afb4718df41038ad21882c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "44428d88329b13c99b745bea63cf61ab9041b5217704618e728e10c80b4665a87cb011d4e26ad2ba56f628f0c3d331608a6a6308c514cdcc01c22ef2b85d942f"; + sha512 = "742c9087bb14b90bfdce3995d8a40dd540dadcc298fcdaa36615c27baa661d17dc95cc5d8ddfe5ff039d897aac7994c08c1420adb8206ab473d113c3df0a2c94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ea016f0f343a4b65ffd97db4403ec76fe9d32c03b56638ec27a4764bd08863194eb9052c2ed52555786d24684d8f2e27257877374833eb51b62b862b065ed198"; + sha512 = "e40a96838e428391e4a8bffb25ba694ea62d6177ce5aac504cf37eca763406392c9471731d10f7fd220510f8c4fcb793c02b1393b25faaa8ab72d91e27f29e45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "efcf5678e84d588a58e33f9eed56b5567eac0f704bee59f5d2a9a81f1df696abc7f9dbd0344373add689e201de9efb31dee5e22f1ef1097adbf62ef054d02850"; + sha512 = "7f2ac35c4688314bee804467eaaaabce38f671c6ad4bfabcfab989984df67ddaee24e6787e11447ba13c63abf69d96a0bdb62aa66e4ab23bdc81d7f2549a162f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "701222574544b535015fced8e48f8999a424646e5535d8ba2020c60fa7bee3a32f3ccc3cc2f5630c64e69d594cee26017b856ef8b13133c4a9589b0c72b22ec4"; + sha512 = "cedec6c0c44689b1608972dcb8774e9870b9c90f41d91cbfa546bd37335c771bd0c8fffc7fb488b4a6e1d19b3a5cae87d54639abaa3a093189e2f48b5cefd5be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "96c8037997a2f16fd01fa511895925d8c8d55feea1b4472673e84128bf98f1a24457c56f3707812fa0330c3b387e0b79bf9b5534c3d59358c86f283ba6be3770"; + sha512 = "e74beb5d364761e9f00fe4dc9577f036ca0ed7115c107b55109ec0aa55e4fd726dbb9ceff93939cafb2bb0015bc349024496864eab95dc9881348170c8419545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "dc2df8e6154eb44dcbd80563a362fc54c74888f689ac8836b8e0a8c8c67b4ee7683544ef45320a4ef31a6bf101c0e162d757c29c583df1382a650722db466bd9"; + sha512 = "bb3ac1cc0bd269894eb2362d2e2199fcaa8ea2f906fe7cfe389bf7ba31b24679d5470d30fceb8427a15970b549b0e851d85a4db2da65bbaca23fd5f7fad1e9aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ff6a1cc88071b422bd6055ff0d88609551d4acb3ae57c4a0924e48f789fe7dba6d1325ba15eeaf20746c4e0ee796964094827a8cdaf0251ffeaa6c0d8b3e8402"; + sha512 = "403e148a7de182cd4a78495e80d6c6a8ab8b6348a6d1c70b56ed1e719ad0c49f433b3210d47cedcfac4dba3902ba6435ae0d9825be5856e32b7c2cf0f5cf3f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "726f93f9094ea50bc24e00578a73bf8b906d460fa2aabba8ca1b84f73e2e82346833eb050aaa58361f43a5d12982d85168302c3bc73e630a26b38e029f8fe536"; + sha512 = "4513f1855962b1a1bfd1cecd6bd431fc19a19a201ef4ee715aa0cfc192aacb1aad9b7ccee4da99a89b5ca62b0ea7a1ab0bc5ae98dba9695bed2eca6d56ce4f0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a1660a0ad425cdf16ddf69259bbdd833204e813af5f36e81757defa470f45c43b1a1235b7d937d85f9d8584255eda668373ef8b8087bf5b7a6d82eb2930a69c0"; + sha512 = "9d4a52a622f174d1a9e6758fd19abd3579fb4d2e53de2eb6f8cbffcd6f15d533682c4fc802b62b50e2282fb51aa966fcbeae519402ef8ddcea9f8e0352f3ce16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "695b4622a597345cecb4a9462d58c5f58f5a4395b4b46fa72b1a47cf7ce9bd1e0052ad070298cab0614092b9ce0f268c95866f2cd77c35a5aebb0968bf4c42eb"; + sha512 = "be101428478a333987464e6df2e70f24c31ce31a5760405ce511c3c2af4c8415d51204e97d941d0f8b0ca9966e439835d4f295cc0f96c73e963b59e230a5ddbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0c38f24c68731780c99c4f361a4e1ed06ead7aa95382ffd3a9d2b939e5fb6890498528433f1cf9ed60505b540805656dfbd12e06170aa3af2b7aded1728d2300"; + sha512 = "74d30138e89a1078dffeaeccd477fefc5c508bf2c4ee4a88c5d100c39b112056c9636d92acb642ce8cfe98239e08ec2ad193c034dfaae6137da5dada030a9917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4e6c26ec08a8b49e06a7139734216824de6f3ebef6f175403e43b641603eee066d83511dc0fb9f19e5ef9a126637b137bb3b31d345d00753f03b4ade413e4002"; + sha512 = "634feeb47538b8e018ebad76ae0be0c30154b25ca478852f6e773d9eaf5a28945dcdbc3eaa7caa2f2190f840497bbb6bda3ea38721ee1e4faef8676130b21264"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c76a823191caa3655bfdb45d10c4333155b71808d08da8b85c581521d0f9fdb1105f60d9586df6d655dde082dc93f212926bdd8970c629b80e3c4328d2d7d994"; + sha512 = "0821502510822b9d1b239561f0b515ae80c1b20e3d97b783ff4fd98fcfcd86859731d5b3551d0f59fe7bf9f478efc6ba914eed0591d6dd2548fe27fd1f50c729"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d5ca0b5db73a8c1bf6a718e7b7cc7435a40506e49997bd18ce869aa9b198e3a424313e4bc8cd19529ec4d9f93c92a75de9f08d8750626b32d8f0744523c4380a"; + sha512 = "4bad268d8b10bc3422bed446c53ac2d52a48b636455531117a16f4e977b1f1ca43093ecf484f3f09cd2f021ae5dc390320daee3e2e863b91751db4f82b32a9be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "eaacbb06990c820d62cbc24bea736ddbd815679d72495f57089ac29b9b1f47c2740c905b979b0b6679f44170986651e1756e616d000331221233cb2aaaf82f92"; + sha512 = "5772be3713075fd78391494460a3e16b72202bec35e797c2e560bed9bc91163d61358fe76710e0238d9d4aabcc7bf8f06d08603437a80996ad136357b882f0a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bcfd0e3cf4dc1d5666add6aafeac746452641e6888772a8ee7593f68939a409067f10b5ac58826e2fe4234f7edf7bd0066b21e8abe0381a53ea0fa1a8baedd05"; + sha512 = "949acec21ffa40045e3498970c867bcf6220814d68e4871521db3f03f5094dd2094a5760c29e505bcd2fb7826da2729031d49815cfe1a71373014f76ac29ddf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "25450381401bc26153a8b8bcccfb090f6bbdd0511b515f7db13108f4b7625c60c1abeeae8123b59a3178b8d2afcb4da33ece5519d150c4a60871593f62210c12"; + sha512 = "0159c36db9f37cee06d66b425f0d8036f68ddf99a7459884faa1dee31a0d91f0c0761b58ae0f69a40d5efc1a73fc930a9e1e02bc401797d8c2e00c6af125e03e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f6514c01acae82c66738d0564f2237b1598b1a0b83894aeab4a6f2abca209c8e7c5db1033e87b8b6e5b9904a6011afd57e28a2d438668ad0d6883d30868f555a"; + sha512 = "16ca273fbc2d77391325f8551ff548344ec59b65a869f2e4ccb20545ee28b3cf1dc15006a208285d33765ec6e200b224eee3272fa91e988a34b671f468aeaf2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "371571ac90445231ed59650fb6796fff63cf9f0ae26ebbbb33dc4174e8021b59edc0eddfdcbe0618e308dc8828407984ca91fd2b3435452bc5d2d033e25fcb48"; + sha512 = "9e31834faa2db1abaad11261abc17c19d82a42dc7eabd3ba796f542af83bcbea2cf0a234de32cd023591ce5a6b4a37b35375cf0e1ff470500e56247c8cb69560"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "3d664fb83d2c15198d8d054d99de307f17cd5f5c26d8167b47a44a74a6e0d65bf81395802d350c84c54c7635845b233be60f3dd626007dc7bbe2e67583d9a42c"; + sha512 = "5e0ac9a0965f9674d4d06afeac7aa0ba35987e683fb29e1b77d22097f98b5d1c57599d6e22d191cf02363715aaaf3266e0fd79aa3fdb2c47c3fb1ae83bd9ed13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "9ca6c029cb33cdd8fb7a01e323b5a29a894f10eee122c6fa47fbf4bfc965258ac986b7feebfe2094220671bbc77492ec0329c2ed4b3c54c76481a97496c7b3c2"; + sha512 = "73a3ba8c65ac491b2eb4f16929f7858e91ee021b3dd8ce6881ece2a355b112c0f5629aac0eba02be8d50f522dc37f94dc7669bc5b421de85e72575fc689ba14e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "16175f3bbebaf395146a23accc071cdc2f62ce407e78a52b79c32afa43f1cb9b6729261e2939930d6c6dff2276e888f093b58225b52e57c650910a1f1c46a4e6"; + sha512 = "e14ff47eb986fe81611bcdb2c5896aa9a90ca8dab3fe1308fc18f8d13b066011ab04cc081a9288522bfdb40844555631d15a4c643f18b4dab6df950a191733fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6b90005fbf9aba2a4d20d57f307abeeb5d8662d8405a4c6ada4da5c302e27e20448d3966ae8742e932ece81f7bf8d909c5ac2e8e4e71a65430c2cda3073617c0"; + sha512 = "c9bbd34edb7640875921a8f5b8ce6c07f3788c73a544e446e6fc0c011e875e998154be7a27e3296358cea505ad2b318ad4a743b0c56330b6acc7a82b19bcf8f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f710706658a248fc40c2bfd6c8f6ac543837ea1e2dcce7cd25a33982bff50b36a7b9463261c033ee49a01d1f340bb7468460bf73bb882ac814c5b15fbe7d13c1"; + sha512 = "9e3eaa81e7eb11000e67cbffb0ce227ad1983ef4b29bd138e2c99895010baeb0af010876d97891b147244c531b05355440bb3ced6310c1c7bc0117b2688b95ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "37d95434ce619068412fa5e74e15e6460b310527723d4e0d763072661721aa7eef649eff79243ad4260c2724387fbe7a71fb7700e8b1dea9ab2374fa49cee579"; + sha512 = "d88b17b23dc4768e3368e505604828085baefc1cb5ff2d350961e40a78fca10634cb21281699544f8fb42fb167ee18955950fbda2f1587a2054d0790018934d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b3cba4eb00e705050f2cbd8bf559c35f43742dce6f8afee6abda620ccbcc0657887b35077cb1512de0a3653992f6227c493c655ec11d048eee1a5111d27c42de"; + sha512 = "a6c48a51cfe4c640b7044a168258c7bdf4ebfa4cf19c4a4386a87056ae0183aba1a97cbddf87ee9b66e57520ae00a24e1a5a6acd0188fdc5e1d3be63af6ad245"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "56dd03e6ac80b2d41ea3132845a72972eccab4e70834b0eb77412d75da16428ec8d518f4873abb4b45db183546cb3c9e6ff6716e6f1667477df60315e51e6610"; + sha512 = "73efbac7c210914940f459db4470dc75187f2afaf43969cf7bc8604304c2fc77e384e16952a9870e9919cc60a1f8318a497997bfdf12593be76eb747c8af35a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "24a589c4091eed2cd2333f769d32913751444f9bbb5421f6f1efb29134f64e095a8fdbd52342895d57bbe277e7e6a6d437f201e5a9402510cfbf9e0589fa7372"; + sha512 = "2134fb5f94cb9ffdeab346f854e1a53974dce2a034589b1fd30699ff721d7c2aab2e24fcfef54fac41d9d781fcb5f83534e9330572fa8a76d5a04f1295bf75fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a53b212685a7dda9a8044d7390664007cedde3005276f5b84502f7693abc7b573207a25160930f4269b97aa48962eed796e2f4cb91a6b9d251c786716c1eb8a5"; + sha512 = "b4ad171d16f8ea4331febcd5c875714125cfd15639299001770a25f4d671c868d3c7d1a058b2a75ceb7e61b458901bd89536567eec4654d04ac71172a1f98e90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "029d0a32f54a7f59801c53309d4bc6a7ddfcaf5cf8398a98d42451d2f7dfc398bf4d3f54a7fa7cfdd309b6fcaa91cb751ea227d3c230ce79ed1306263b50977a"; + sha512 = "c114b3cbf9b16bff9935408d33f5ba0f92c96daeccd1602e07c7d730683e3585f9320d7812fb1489e983fe2f197de285ce7e30d4d98fe944005cc1889e0d5301"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6c76910971236407f4eda6f54e9fc8cdcc94362341eaea189c0fe32fd09bdfb6a817b14ee81485397752ad6f9d6a7177f224d98025aa962061e32ea83add2173"; + sha512 = "e1005f991a598f5fc2f45bafb3d2eced8b5dcc648680fc0e0cc679f13af5ae3cb0fde38e9cfcc535afb2dc9b6dc8ae7fbfdd22c86b1c1818352a0915439e5f64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d5873e3637038213feab288002fd16bea5b4d8744ef186ebc47fd4b94dab93defb4384ea45152851e131e1ff9d362e6af7b59cb63c1a853e7242a12eac896b80"; + sha512 = "b720ef0f36115a388f94fc99cbbc39f2f40b2b69d0740aa2598543cdce14996c889b9e068da92af374a508309161995178ac003cf1172893bb1cbd5a426f9ef1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f2a02746ce4b527835acae82de58e465bc58021b7c41e850576715587933f5e54ac6472809f0fe6c1441c4350b938affb3358056af098f36daac9005edad60f3"; + sha512 = "bd8cc5a71e69d8a2b7b319e27ae8df88832d33d8107aedd54f8cdb8ec8b87eec89b718a092c4b2d414d7236f4212ff901041c06455d9eb939e26f14601563584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f99b18f2b13a6789910a6cbf4dd97bc4da6540c95cd08daf90c0744d69372333bfdb6946391d930b608b640da07a19db9468daa186fb86eb837e7df45e66a2fc"; + sha512 = "4798d957102423ec6e4acfa622b58391542312180314f2a02f52a4b9874687b1e4140f7fd13c939dd5f70fed9dcb7bdd168fd2dc2505d558f99b2d6fc8d7ce70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5f61378ff50b566e02cd9f70647558b2bacbafa07007ce7bda340d79b13d69dc86a7918614e411e5bbf1e3c5c739c6bb62a655605f1d5617a9176526120b14ca"; + sha512 = "56a199baaccde45bca1a640f81fa62530cc932629902d50aca73a59e28b7a70c0d9679d21c16d3427df497156a2ef3bd718da99824ccbb323c8af695d4fa0bc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "eea76df7b67364649f10a5532103035212b0ff7a42336a6732ec0d22aa452f931326c1251b1ab8f61dfd201cc54d0f47a1083705b2b7d8a675ccd9134e106a44"; + sha512 = "1ba62b6ef66bb8247c53e38214aa15c416b6a64c05d094ee0a51bc4537d01a732e00c6515269c3f86f22ec6c580f47ed5f1cb455643100740cbb7762ae6c3fc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5a9e5aa33ead532f51e07a9fc4bc5aaf6ad77795e49a9abfbe4e488958befc16d51e4c047f60b4b884dd53040624d9f315f1f29dcad32a52ba6f2853e244a99c"; + sha512 = "1ab4d17cb5e2abb02aa4550028e15ad92712a2841bd0385932f62d98d9ba1453fa91ae1a9841c444ffeb7e96d469bfefd6ea48eecaaa2fcfd5b822ac839eeacd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b757b32b9733f7cca8b9a5673403df2887861f6dec66319f8316cb23dd20be03078647bc3546189016a25af58f4b74ebde7abc29f68212d3205978f313aa7279"; + sha512 = "cfca82ab95559801654c140dbc7d9d7e86cd605e59511de92d724b9fea2bbb027e621eeff10326b94adddeb9cf5e29ee73cd89aaa54b803c664830854fa19a9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "157862e9f36f6990e139fae95222c31c65377594c36e348a1ca5f69dc7a11f70972b603c0eb588401ba6706a7c117679b92caa6099b09569df1aeb78883beb42"; + sha512 = "056b45b614693a0cab73b530ffb9bc50d2174a2771cf9e932d1633133e02a174305e8773a7fdba1dc2ec4e7189407b51354a8d3c13d1c9639d8f4337029e7d35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d64db24b335df9e41a873b8b5f7dd86439ad96921707d0956f5ed31bb7e38039173226031fec48fe957d255cadcb0cddf5bc897fb64ea404a46bcf8466a8a05b"; + sha512 = "37df62bf5dd1ba63b31df5b736b82baf8cada43a2fb02bfaf97f033d684d6ee8cb9657ba0531a806796facc5a6fe03532bcfff0e30c93d74fc65c7995b323080"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1851c28d00e8298b75c3e98bd32c384643932fe2528ed547fc08f04ea1440663184e928be69accc034628068d935509f5f9f0df79675803bb23cf8fa1e00a067"; + sha512 = "537a774e8fdbfb3ed3bcf306dc995d807e17904c5702b83c1fa24a665cf4fc8f2b00f9327bb02c13b8dd73ef4128f676a115807cb5e8a8b85cbc11c308a0a6ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "77e0dd746cfd9553a56a3912f1e4eec31c846fbc7a309241e064145f42ef572cd54fdc30d788531069505b0b30371dc9e977a3e506d1e6d0af881160f21b8eb6"; + sha512 = "ec7065a86da1f23c1a48478257b7c985c95cb14b40297f2bf25fc10e63beb8148f8df30c61a719c4148abb62d920bd771dd412f47e328f9641d0525f3f4eb971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a2624628a55d83b67e8fe795ab41a200a2feebed8cc6d3235025d8ab32b7423ab23ba1eba914104594f74c114ec79f55f1e339ef8f9b2999f9f69d5db81d3e5d"; + sha512 = "43a745f61271a3d9805ca9a94c69fe3d6f05fe6072074dd6b3258907f185c0ee12cfaa7e32a948b35053955178d518ae2498997b1a597e4fafd023cdf6b00a44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6acd8b6a40ce2b80117ffed130600209907916da0e3751466295ef4c17795d459ba410a1979ba6755ece14aedc974afe815f774f03a53c9418d0d5023e36950a"; + sha512 = "b26a54ff76d79d960f4fafbd4871e2e8dd7f3af2408984fca74c326693a26e28809844b65de6684225923cb7029e8139268d2222d058ddba96d273dbf1180ee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "84de46654d08503f735e41cc2c8083f6adbc80244625601a242f31b3229840bddbe3245b843f9f5cd4483945b78f14b3998f438be4f26bff9d34741cee21e271"; + sha512 = "d8e82a6a104e7f1bdb85dcd7f3b292c9bd066a09789299f893f4e83a09a794a0187276636a2c65cbb50f4dbb1b85bbd6afd934ec184a57ccd5e670242455ef20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "295153e98a8feaeea1f5ba6c8148893cde566449ab766f28a5c6f99d5a8918a6c654162c888c883d0f4f2edde6b6740f7b60077f9d1748eaa0fc7cfc3bc8636c"; + sha512 = "34c7c48ef40d7931f62f4ebed44e036cb171d1f592017dca740c46d800f03a7bcb5caa7312a8fc845323f157d7dc5f8c5abc75717a4429564acb858543f44d5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6bb9b3f62140548a6e9c188aaccde4265b6c81d6b19c4bf5bc8fd9b38680ace5740e483af35da878290b5f8c14610a91ef0c041e6ad733350d99d85c47d0c250"; + sha512 = "432b759025ec04752d12198b50ae6d883ed26fb0ec568a5644032ebe42cdc8cbbb5f38f08280ca6ef1790e104dd3af1fbbbcc579ca5cb18d8489576b8a20cf63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dd1f3336ef41030f78d3a2c246f677f0863c3b5fdda45bb439cb99f620afe66642d0cb436fa1472904e2abaffbb2e512fedc461ec615262a0899e236efede0a9"; + sha512 = "573f25755af311fb3a4ee7ee9aff172dfcd1ee17df128b5742dc67ca651e71f279ad378b95745e428ce9facc47b66e763c297d35963d3dc11fc57e4b3415e9cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "db4962a11da935032958e7387e27f178d78caa6903a992f6a014a213a3f6278ff961d746c32c074c4a6320f122bebdb5f48813534e570e2386a1fc52c74d6a6d"; + sha512 = "41be1b052beaa4a58466e25b7039470c56e6f9b0ae22e46c38f5e10cb65bb1500df50810273c608fc83f73f0f103be9b4fd63add9c73c3f3d855fedb241c673c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5cbb7e135aab4e36021f2323335368dcb6ed32e50304a69c74a3d6a88aaa1bb7c0dda646b141caf9d6a381a4fd260f46da638ac0df2487884ae8cd0bcb19d13f"; + sha512 = "25e5e82f90491793e7663f956e22f08581f071ee2e55e2194925cd73898498a6cf8a69652b0cd0c5748db107a08f47d5a38bdfa89e380f3b5a9eb6ce3b3eb967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ef84eb38c46ebbfa43e93bf26c0aab073fe22ac6abd7683de068ad22566f0f5ee1316bcc80a9a1c15215edba82c42eafcb7d5a0555ead5e03baa9c09b17558ed"; + sha512 = "0a4c168e17efb5d7789269e21a66be1fc9248d07feb68c956b7a7e179c961c2e05c1e6b687efabb05f0a57b570efd3d6028998204f7da846845b58d098e099d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e1c913e4bd51637e757162e453a7f9a5d452e4f1b656c5259bf4cf6e1a6680c5a5b8d065e692cc503f180eeaced7f08a0e14731b85077a45d46a62f89bd390cb"; + sha512 = "4f618c6bdf212251697d3328ad9044fd6f0bbe1b5c3e90febc45209d886aa8c5718316023640f2e3d19e6c2735850111a907c07d02cb9c35ecc4692f39201415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "0da0ae2a02b271667e58872b48cc1ea6c01d2778c31c38020fd120c6f32ff990627a529f178304af80efb5dedcaf9558a44f3f198b0e2b2a4c12129e6e278c3e"; + sha512 = "aaf6c1e0075886e3965f5840ca804dc596b8ee495c2cc7cdc5a5b56fe8422a77ad22261996b23d09782b0a84fcfe23836a5068251757426440665787704f4f5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ab937a1f08c0f0ba6b70ad29a9aeec0d61115ee15f57644cbd33cef4765a19820968b36b8618732ec9aec09111a4504a840d3d4df99728f44f04e6dbb100a71c"; + sha512 = "fccce9a1786accf2106f0aa7745fdab89f86dfc13240a8d08dc665777cee64e6c5a4747dd911a3246cb0bf91acb812d9496e3129a704b3951e2f6efdf6932393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "20ce9c08906e2fbab91ff4ced398e5a956ebddd96e6128de79a4ec3370ac512322a9535605f9aa3c196d6f52fb55630550afd39a6c0e46d7adff2669e637ec53"; + sha512 = "29f1ed0212d3cc5ad758282ab75dbe9034d890c80dce4458e6b31ac35ef071026f433802b9eb49f264ab3d2189c64a7e3a2b44a909acc041b8e8e58043c1ba0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9b213b2e8d1063a369b673e07040aa5bb53d1213a3725d9276534dab45e2d87707009bcbc5cbca7de7d321e5457c7e38e5c801d57c6d1a400a8b9441fa2d2b08"; + sha512 = "b9807a6327a2cf6d40b4d12e42d27217def2ac62aa27f0dea872ddab99f125ac08ddb815d5a360bedb19b92c4dd5a7be46d8bb10bbab5ea7a82959cd35380c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4c89b3ae40b27f07652ac580a4484b7b3fd50e69e3894677206feb45f13238066618eac22b17bf81616b9a0fd004d023152ee5e028bcd31e72214a361d36c639"; + sha512 = "8be5c106e64aa30ab2e74fb4785fafc15ac4c495499741bc5f80b634a276dd3f639b5e00f20ab90f732419c80f4fb5600a19d1e20d4e46a5049c86340ce205d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ff23b317791f8782c2aa267a5a6a1fedf8a10c5774263e4a6c8059d649e0b3e52972b33778d092e99712aa777e4a03679dbc4d350fd753c3e2b963655f36d5fa"; + sha512 = "86a527082caa8787bd2d76e7ed32b0123ab9d12229da1d66efcf8d1cd72eecab6da73c5adb0f57bbf5b04fa5f09fde21ab2d12c31f37a9005747153d2226cc04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "6205561e9b7badbb308649b2caa9bf610cc71dea0cf8c02322b682839c8279fd3708768f62970a6efdda6d0f2d2a6f72960f1ee86a174760c1ec235d7b30dcbd"; + sha512 = "3b2df769960d791ba4a57135a242b77bf62c21170e9763136ab6dc91d49a421ffad0b92b3c80a6850a9e4f326ffb4d32d27c70581f4825e05d2a244fcb4995c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a74f1e49bdd1b7c0bc29a9023571149859ec145bf0a12bf49aac45f2e381689f49370f5e02a3777334f3470bc439e6b962c49e5bb05092cd3c817adc9a8e890a"; + sha512 = "4847358c0d1e3b4c350978f9ce54df0ba74b95c0d6f734d3e81205228b295743bfa29b560cbbbcb11e32ca2100df6555b8f495675e16cb525b7ae5ef77770d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5ca453fa3c321a9503088bfe01824e3b3c287a90fc48c792cd0658e9723f982888847cbccea423c1b9fc1ed77caf703141a4dd0c697a30d0ae1e5f8d8d8c547c"; + sha512 = "b73bdc8c1768d9a335dcd4261c50fd5a6d2d96ea3f29579dda4262c1fda6ad6e30ff52073945a1e5cb12bddc15c4b83796585bee002fd1a4988853a46c467bd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "f3a5109dba2f2c4516d689a17ce19faa7385f5bac96fb0b9f72fdbdde0626df701fc821a1defab8326db93af7baf9edab594992a9b2d05eceeb4b1176098b557"; + sha512 = "c1a26b027acffce2ac8f38cad8403bb50688fd51e330bfbefc295fb854c0692e4c0b928fedd82fd2eee425a20f6577309f5da8b04b4e12e60b03556ed10bd059"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d2bb114188c11fda8e3ed59454cb623f8883328fd83705d21fc74dc344f41582880f1a231aeb941d32bd1b3ee1f6694532f9da82944be56e2898e6e750e48da6"; + sha512 = "5184e98def6d4d6c9b7a77f7be6dcb1a5e3f88732f14b394c737a5ecd3bd0a5e514b61978edc0594f2f503cb54b7f22bfafbc09d5e697d3ba2b530cb42d26410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "bd71fc5dc34c76bb99a2da062e987666fec47be8f883065ca456e3bb888eadb747648571c0012d924574c60acd5bec7c8443890687309cc2885de09d2f695ee0"; + sha512 = "2ddab9e165fa114153675d3d2f756cd31658f045800b0535f4eb468fc42d260574fa0455c6cf07ab3c96d2b52d557082a4b0cb15361511fe660d75befc302434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0991d3ee984d0e8f265a0b8092f75d4f87b03b7b0b29bf87706373d130adc827bb5511006b4e708fe06cb7ca83de27cee5c55166eb8ef2f01b02e343e1e6785e"; + sha512 = "8ae0d4172f290fa5d51fbd2e477b3b1f74615235155037aad3ce5b2afc1ab28b1f2f937fe0f5bcb3564891fd2171e8c49862672a77e4057b1d7501e13e4bb6cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5a600d7f0b48c6a6a96bb346d64a8df9d5737e81215420fc221526ec66d18ede9a32471244fd226398bab08c4d722ebb154021ae13594133c34048d7e0a2eaf0"; + sha512 = "c214e9dba678afeda469d8f7c858837cfb0a8ce13b281469925eb86d94f485d2f181d41a410fed049744a692ee1bf5bd004238d0e8192eeebc50a7fea37188df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "27e53c68f58fc3a16e4ab7e56bf0ca9df84beec10a2b037c9ee6a70b7a426c45fe3afa84d42d0346a384f7c8587f9d3269a70403d5babeb59d300ccf6703d423"; + sha512 = "44f8a7fa592105aa6113227fbcb28dbc40904e50b2e743c8340a39178d2f821baf65f08af1f971af13a25279c76f825c684bb252a967f2f0bbe53f88574a0a25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3d1525c74bb1a841a300f55e382732383db62907e76bffc7dc25a1c4f9b6abfda3831f2a6fe8edd143a41059a0cf3810f9b0f07a36ef45d2ed3225155893ce51"; + sha512 = "be33124e0c0c411fefc2a7cddf3b1298f04423cf6a76b879943cc2d63f1005ac73375b9853c6af5522ef4381558756f2a5fd417070565851a16a59f29ff993a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "769ed67982c898de539ab8cc45e45ad0877fbebcb9254ff00ce90eb2dac2e886d3d9b3724ad9b696e57a0fd3911e52e8e379c5c46bb8de7a41ddeaaf6a207237"; + sha512 = "45de2e78408d56c11982868badae10edfe90e53c98c03ff67d9c7c7ce82603050a5f44a99da1cb17447ed57a2ec5bd3a12a830af56b2cd10b80d88a329ee35d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "575de9b7df4c1dcc720628508393888beba930466a582651cc8cb5faafe63ddf813fb387763590270e81eb7a31bd78229ae311365f42f42823073bee9d35714c"; + sha512 = "fbeec26c20a545f8d34b2848f74d433a8ccb8686eec10ac614e06fec35e017649108d5a371c0073980f7c38375c700d58b298d640b2b4b40711b60cd8187977e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f886074ac57d1cd92bd0bd02bec7f33f9044d874bcd740b7d1d46980744e744201cac4585307844f700e3f0ac7aca8809c3c8e68ce19b0ce4d1d81912e3d7c18"; + sha512 = "54974c56b30eee44d29f5744176260c8bf6370a627e7b9439c3888f5be584280436f80684ad3916ecd7b7fb3407a379546da1956e8e6bd8829f3b2540829e068"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c7a95edd18e5b2f88c1228950ae311ae90f303e0cb18eac856418a9714da20458936194a26b92f4d3862af12dbcaf9a2452f4ee360d2c4223c088c4be9f25bd2"; + sha512 = "a3139bd9fc34f38f55251d1fa03589f859d69a2dede76dd699980a5359050fabe4b9cedb352ddf21e1dff8f4f328d6d2a4fc87ae6b64166dc325981df57d50b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f359a63f34e63f4727d0792664dca1ce69c0a2bde9b0201d1894589a0db2f8a99126aab553c8ecd1578bb05b8422820f27cb9fa6919ac09791056691a35410e7"; + sha512 = "b95635c38ff7a4a23b1c383ae8296e5362f4547e6082a0ec355d9c400176ed5282d91bc608cbc1826903dc26039278e1f923ef0a0e850d96232b59c61eeade90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "1d64be7fee2f41c88d082761c6f65b57f299061f3e3eb6db2d8b524b7f2c4bb8ab8632cc2ed611faacb5ab2a47cc96ada67fce7acbf332ceba105538a849e942"; + sha512 = "770277e4ca433f50a13bf2b962661f6d426f580e2ed71b23c687545df38622dfffc34df27f892b0b20643a19cd6cf6f13647b9ab5c1650bb089cf5c95e9726d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a493559f9a276a388a01316b123d3861a73ba677805b16c2984437e42aa7399d821c13c678d9c23fd4939c9b97687273514d454c679820db3279ec5f74aa811f"; + sha512 = "eee5341bb68d8bf2102aee543b5a355e0d44341ca0c9404714a5affb215cbab5bf329ba80d145f31c671da096a308a66baeeb631475937d314770fcb321bca72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "06f443ea5ff57033ffef5092d5e47adb0213db21ceea8c5b08aff9c140c0a6d9b8d9c590dc5e36d9084eac3a7de26c5754f09e0b41dd3773cedea4f212e762a1"; + sha512 = "a350c005a481f08b5a0c3683326e1b95c2b1a69d64e8195686fed68be2ea01752d9b8cfc36b62ec61df8730bf14e6603547611968136518ed7c1d4c5cce97852"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "34b50bb908ba61cb54fb99ba3a02447caabbc463c2093edebfae8c555712ca2dd921bb64960a782b6b83673e6756004f84836022b319513ddec6344442703ec3"; + sha512 = "d0bb1e20e75ccc0306b01c6a96b3c7e169afcd7b72e7ae881e96d6058efcabcb814e0a33acf17628af16bc014083bb48d7f53703ba58f63cc871aa417404b515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "3fa9e1c43af9b7e290a936fd63d8cc552b1bcf92e0daa000f177ba729b850c43a315883fd66417b5de00f14b16d73ab4cb9060e263125ebbcc7d6a6011c7b4d9"; + sha512 = "70d749eedcd0fcd96e17227f60606ec36783a95beae52854f48d5692ccc0069e9af39a21c906140b2245b01631df8670364537d0019794788d063416506694c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "55f1ea454d4cfa5d9c53f8724ca96256694805cb11c1ad2c7f87b70e91cf506c0aedb91346b29fa853df63c637c89fdf600422ca92f54fef4e9e9792d350b018"; + sha512 = "ca3b8d19b75d4c7379833c4c77ad03aaa2f58bb1644da6dec4971ec4a4d42109e903f50b82eb8d6cae8ee65c4511cd9149514c8ca96fc8c73ebb0bac0c83dfea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "62adb09839258d0f1a08ec7a2c1fcf3a2d6a306d1cd3caf383d9ad281d43beece215587de3bd71ced2bb18c3e9362c1b8855f60aaae556c4f73b5bfd6dac1015"; + sha512 = "7b73224876d367a7d72a068162fa19605719c331be0b9c4970e10461b9655520edded19e013efe0d4488b40258a1de6455fb717333470441af6cc51a69fc39fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "07fcdc1c3d39339ecdfaec8be13bc104ec1f081d54faa2811abfd0a568624c1ecc05d5375c12a419f975e3b75ec00397f7f5ba0bb0f0b4271e1a7304225c0f27"; + sha512 = "51e823ef446148f4faba9e9037ec132d3e9d8ce5257b1672aead096035a95fc42ee9cf8003747252a567a487c215bd11065776515059ce16f2d2478754828da5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "38ca6d4bdd0a170202be79c3b0d501643f2dae9dee7e257609a915b444cb0a680628b6ee1c812e67e0aa656d3771b0194af64138f181cf618c3df70bc002f93b"; + sha512 = "e95b91131b23a0447f9c9a129790d1b415b05814c7ebe00ab04579835ce1ba47ca09fe9285949635e33164df7f45e838763ca5a2ed88efff950afbd923f5a1a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1e77086a1c55571475227c0b4a76fccc99802abda94d30cc24c4a0ad36430c3fd5459719c0a06db64010d35413cc11342d6e8be364aca6d726040827d152ab59"; + sha512 = "18f27f39d9953ef6eb39f872efe3ca8b371f84ddc5253e5c6440a3ea5916fc602b827420e5f7737e0596578fa2fd1d2f4663fe1e9b2c977d8f1240decd874dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9327d9408d0904123769e5001ff5c31e2187d0d198c29f39edd009d7f6b2d4f68f73a4026aec57bf9542f669c55ebd8748c58e30d8eed2e4df28eb0c07221340"; + sha512 = "f1cd96c9d1db5d7f47411fc1cb12e8356bbcf1dbd1828e53e39ad3ab1ab9ad423b125ff9b0ab18f5bbea1ebde04d10768c759aa60176e1a7277dab6d10bb891f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "eb81e72e10d123a6d301107213149ec2fccb522326baf726cc56fba0944143512b1984d747b256554e6d0d6c861483a6d2c53804556b4eeedbaac64fb65b42d3"; + sha512 = "6a802f54419d911e2e8cee0a1a20e7d915c8ad574a119c6a296e2c951de8bda1874b2f4c047f9579589f79520ff7a155a0e9a289120b4539578b27da40db687d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0ec83ed676ad164571c45242e4a8f06cdc68ca1069c449cfa3fad0dc799ec5439a8c7bdf68bd196486ab9bd3bb7d956dc179dd872d8165b229c222c1f34188b5"; + sha512 = "f5fbc36114bc91039ed6fa9e17345de50d1300262e1244748a311da0dfab38084b5680c7245063416bea3df29d0e601f7acb11961ad7f6773af63ce7fcf65883"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5bf46c9e5d0d409af159d59ee643303660c55cefc4a7ca91bfd21b9ce5f0dd09d531b15fdef9a5dc9649fed5ccab28610298523cb5c56362cfc6ba12e97f2b4a"; + sha512 = "eefcfc5d5b2123c4589ba7358aac8ccc01aa9b38cd4210d3e810552fc25c66467c6d71d64c0ee9b75cb2ee1c9d58a2ec6e117fc60cb60a678576076d2cd8db08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e718aa0877c3561085ae4ea619fe902ef6eeb8e4db1c6f18b82f0811df6b80b14d9cd2241a6f551148d7d75899731d843ccc3e6de9cc6d769d327cfe8db9651f"; + sha512 = "3447abe024b9b06b7978320bc084cdd6179fd0636bb60e629fee13d5e671e5e40bd398d8f296abdd1eb353eef57ae5cd22b20722f390451bc9bf218fb0cce392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "55eae1f05a00991678300c563ed44fe362eb41513b48b39d51607e7acf2a46fcbf9653161d9fbb1e82c5626f5069337536023418fecdffd058069711fafa8b4e"; + sha512 = "e145d2aacee3a41d4ac178ece89e1f4f223fae87dd2a2236199abc34e83e2bad5730a6ecb1542c3cf6508e2b51a64ecdeb4293f97328ca683b62d8f70f96e9d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "afea9f0143a8910028ea7751a6f06d116beacd576c3407cc57bc6d92d4ee3340fccf9801787f281d6bd04ffe75fba907e044ec179a2dd30bad58096285db6ffa"; + sha512 = "c040b31191c14e491ae774c46e33c8433f7d15f5b4cfdd1ae2be3d292d750cdba271e5f5fbbfe6f2e2af52ec24642d524b7141288234e91afe038aae4b6da4d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "00e26875f2250fa32c3ff1b6082f998b1d66711dbe3c4d0407f88adece9140379025cd117f9798827e63ff4ec2456b146e0b1bfbc376522e469aa0f55ec96ad9"; + sha512 = "e6d81219e98cb11e9b6848364a551dcd427c7455d4ae87383d43f191a15bc13815fe7654a1198f1fc5ae63d5d300ce8bec801f1eea51cc257156f99d2811d0c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "859a5bb8928a4892aed82920f51ee2b5ec6a7bfc0a4f0e3a149f417393095fc49b3a5f9cd7c4eb9f1c33777f20f769698363d92e195d7f19cdab28b7444d90bf"; + sha512 = "b15ac4dd72f0b4752e72cf6baeaa8f0f2bc34303886a33ebe8859ed8a4fa2382abe260d54d9fefbda9319f39fef056bce53e07d1772ad79b5e652277371c4ac3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d99ed33f72b671ab0a4833e25fa18071240491fa2e256f9748149e878fcca828d5e9c36e54abbd56f3bf92a190e1c4d81a7101e89a78c1b69525961a3184a207"; + sha512 = "90c88df007abf67f973b96439ce4bc3d62f678c7657cc3f04f7bc74f7d0eba4fbf25224e35cb56d2736861413c54c95fe9d7a4170a460def0c7fdabad5813bf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c45bebd4526245e46d58031078add808ef38fcf301661fa754f40afccedfd727f19788accc098576f1757aed54652e1a88c4d868bc16644270bd8feecb086d7d"; + sha512 = "ee66d559133bb827cce96470299b1cce56f9d2b8f16f013503138e54a9c3aede0027ef062640a6c691d551b5b56025b06d7f13e92bdd5a8c9a7403f5aea88548"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "39301c26b62d60670396ee7e6f6d4c04c2372d345094b65d37ad280b3aeebc5a48b4b7773c6c6a285b137875b1ae8957e29266ae352f0de1068925c428fa4b32"; + sha512 = "9507c7958db71618c74b6b23ba672668471a0a8f7198ce5a711d087b485f8504b4471528320e3969f2cbbc34e02b19642833c8e2a963e3af745fb5b59577ef6a"; } ]; } From 83399e31917fc2402a0658ebc88f43beb6327775 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 1 Jun 2018 10:00:54 +0800 Subject: [PATCH 133/153] firefox-beta-bin: 61.0b9 -> 61.0b10 --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 13619aba30d3..b48eaaccf000 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b9"; + version = "61.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "54e9f255a3c7a03206774fd9a7a5ca159d87aaa87c2c4bb097372a32e468f623ccd3bf871022a2a2abbf048e878eb7de8ef6f4fefc5793cf687b7afd4f68325c"; + sha512 = "f1320b763b1b5ecc502d41f16604c73c346d3475b84840623802d0ecc8caeac44a5d754846c9a1a2814fe451cde75e2f0e655409400f4d3acba9cb53c60e9cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3b492abe56f91c88e43b4fda7e9a5ee804073e0416db3806f97593d928bf6988dd33c337e10fe1ebab5bdb3160d4a747d508be0531a0f86441515e1e8bfd1ffa"; + sha512 = "44f0a51ef809484808fc4aec9c72ddf548b8a37b2d405a80349ec0ec3cfd0610fc85288b73a1daa069ad8fa808a2db431f0c8d7fa510cd0f340c292fb73b828f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "26304c889df459a7379dcf50ac29be7e1484e8b7cb9587dc9bc8fd83565f800c3813258d6e6f66926fa85ecd7363dca3c6e7e1418cdcb67577719cb72d2ecfb2"; + sha512 = "c73158c3ae6309c48f57e16fde9c4720cbaa03b82fcae0160454f732f05e23521bd7e8f7371b953bd84e916f00726b44e9dfd1df513b3be2c1a228128d6f5873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c046459a9e0d2e6d486c60faff2cfd843d26b229263d8a908ee1db91a054bf4891bfd6bf4333de28d138dc5e55de886593a6a5ab0c1f0d3e88da4d67ca06892d"; + sha512 = "cf833f4f05692adddb2a34c531fecedf66fabe9b1eb6bf27ca689c97c90fe02afb1396040ac53fa083393c3043fd7547e93a9af25eab48da33437146e71c8473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "055673b62be410b9d456c61ae2db0c9959327cafe5ab75906c3be5d3ed2309988816f23d61d2c268ca0eaeeb367354201d9ca0f94adc94e273e8af96e0a94ce5"; + sha512 = "da95c56c6e29f44cc751e1d96c9cfe81b5c523fb5ccbe7b24b8f7ebb840c81f1e4e324887445c793653bac2f4a1861cd3ebafd52aa63282e0f92d82bf2cba397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "abb3187d4fee2fe48ace82cc28a1dbd7a050977085d31ea7e429b069c805a011000ae0cd6995a729ceed84b92cc725a1d7df6e7f36ed284b71ea818ffcb4ffb0"; + sha512 = "d4d70405b5be8dd2faf01ce4dbe7007d64aa1f25c8c445730c9c4082a45b4fd12e7e921097029bb244015a4de8ce95426bb44a98a6a5a2407985c200b0178537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1ef3ac146b59a364dcafe89a4024b53914f92453fc2ac9f01cd71dca1cade3062530b45ca1ee17c0b832433dd603b6c7faf8d971db5f19cbe62b7733a5ad4608"; + sha512 = "7080c9b35f02ad119ca0634698c2565b375bf400876e73914eb832035796e282b34da07c664513382de9b686f974e830be1932b7c39c2cd816d77f747f218c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8c7cf00731984eefd891dc31b3f7da88f8aa2bab110df3d45fd2622fc4cebeb51efc5c23849fd6f773cac0ce39bb442c627a3ac10657177e29311fa5f5e82d33"; + sha512 = "21cfd56ea6a933c3a9c52c76c1757f33b3dc5bc914a95489a3365c8cabd78ff0bcf12378563c14854df155ecf0b93f0dc39d2520c4a030e5507d190155dd26e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e33245d7a8d169c9d15e70ed7951f96530e88df7648f022684ce8bb6c81f4e3fbe421480dafa8541a3adb5e6a76e01756165c435cb6d086837c834e318f773e8"; + sha512 = "e602233214b5ba1245b7e7d306da132674a5403d233f221b910c9bc6e73ccbd04acecf62f14fa0bcc1104f64b34dcc8c4adc91194f81b576872754b266bb3bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "77da98a1bab406a5b5c71d83fc7a31bf5c18901f8977af4831a09bf09ec6d549d829e1ca5e01982c704229e53d0b10cc99449bd76b138ea3a4d8f89e5593a955"; + sha512 = "b183556f189645beca53aa31dd282e6aa93d40f4ad4316ba23ccae4281ed3365c542d70addc4af544c267077c4eb1a4e797fc12a7a6a3744bf2f8cb9bc312a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "230413831fb4a3c9ac7a66c5201398ed90ff0e6f32479cea646c397cd901c0f4542b465aabd4cf4541d0a2af1734e42c054114c7ca1cf131be3aad6fa7915e49"; + sha512 = "da0ada9f93a6d78c7e26324c74a9d47b9dae8fae81450663aad7e247f95e72e752345863db304852fb2b7e700c0acb4238152b331b817a13d5351d541905e974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "29d83c329e73f5d85863da3b5ca54d5f90e2b83a8e500eaca16370c8ca0b848a721e7b92c6d335e4a8f3acbf5f38e1ee4470d2042f3a9f04cdd30fca48c1ebbf"; + sha512 = "ccf4662ee9f9b5ed94f3b50e328642560a180c4f72e0da9a097078519ebabf5409ae4f439c65fc8020cbbdde5e45516d109d7ef31c37cd46c60730e12bf71de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0277de6ef5ba15d6ee9c31e6512837338c5715d35dc9741190a876e8c853e85e82724b9a533a22fcfea57e6083a2ae6cda5026e8036ac9eaf0992294aa4bc609"; + sha512 = "ec7d7aacd9b93456efa00041d47b9eddcdd46a8473db2d28334443574ccf07622b1fedaabbc30f2b0d42ccb90b54eff20c254c0d80359d656c8b872a8d52eeda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "b8bd25c0470ef22b9127614f56dd9b25c823f0f542772333d02874aed80a16186ec501aaffd72b6786eb03f8ae24e477ed0439851ef45ac301827b11561c3c5c"; + sha512 = "4a4d44681024bae6e714c6696f4476bc27fe025061ad49582f0f01d73dd4751cbeb1837c8bfab58a85efe9c0c65d610a6dbf1968da9b6514fede4e43ded1ebd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "97df63b6f4fb78320bb7821ac6459528ff765b08c9c93b2704f50cb9437663be7c01a31c98ac26d15416c5836c4d36b31de6d94575f96e160137da3850853128"; + sha512 = "904c6d56bd6971e167c5a7f622e1c453d9a1837a8973c2b6f1c1673bef7f43e499a6753d5ea8f57ae68ea8491d8ccf61bc4e013c3cd9f15de1e6e5f4f8eeae3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "25c0befa4481726efc87b766c3b647c21baa2cc2f8a969ca1af2cbe250032ec9cf86af8c13f1a9a6110ce86146ba5cc586e5fcc284b3059f6409cd0e75b0dde5"; + sha512 = "1225e7246316fedbdb933014cc53802b317e44a100d941833fa7ed3f59755afa87553ad2f054404290d3cd519f0b534f18811bdbb6e92985beb10c6c8103cee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "3dc4f1f3d5ac4e393f832f6d65747e1b8fb6324153b87d20fc79b44076686c2fe2f7c3846cd10efef6a996518edff7866ed36ef54150b0fe9b24644b30e37dfe"; + sha512 = "afc88489179f5cbe7e94344d37f4930460d050644a3bcd3acc896761b62880ddb525c7fb1da4d6c564c76d051b9f02475b9d9db0e4a1c768b35db667b2589732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "47c2fbf47d9ad269832e49778d47b623bb910d55954190275d2bed1f2f0101aab31c782f4624b5eff7ebaba165d243af55d798835ff9bb11a62e13c93fec53ad"; + sha512 = "d18834876a5dddd72cd439fba28b91ecaea2033e90cbad5a7d2a6f89bd0433c7e4f2bb6ee0a68057ed8b02bcb0075e29d3d92186dfd2dfc9b7a811fb35f63a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "857d22d48c8798454b374543ec0d5a28c7befe4e159f75394e9eddefcdf679e5628d56d65c3f473f8da362a8df4e314285de3540fa65344af1f290bf92d8c78a"; + sha512 = "51789ce2a18920ca616804bbef5b4cd6738884a6bbbd8397131e6882a470271d630cba4facb8dddd6951af712c5a17ae4703025d51e1c9ab3b8edbd4d444660e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bf57cb64d6f4304b4387ef6793fe0326a1598843a28ba7b319ca90c759b3335aa80d2bab6c38d2388a567aa10121f68b3fbc807c025218bfe991bfe0e7ac3b5f"; + sha512 = "5ca16056bb13f8861691edc05db28aabb3a9d5838c7f5ae231ca9700894a3ebd081bac007aa655ad3fc4724ea31fb35d3d0d33b955ddc8c20651b28cde0d0f6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ec0167050257963f41b69e79a8ffbd5e2c4daa6f05bb9629c4c86e34b37825d4736af371d00da3aeeae5bc935a496cf9413aa06ecc56866cd76520026a8dbff"; + sha512 = "ff97b8db8bae51a15d7167016fa4e3bae7ca0690df5800268b572fb74ca4b058cdde789c6f14423258301fc585ff1dd780137702267070c001eb3b54c06d437d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0119050c48451ea8b4e83a79d75a0244d1498369f5ea940bcc9213b8e045f4f2bdf8265924c6929aea090dc5e452acd12b8ac64285208c37bffaab2ee0d6803e"; + sha512 = "2b64dfc41b38af92695530cb4ef63ab6c4272bb99eeb4c848daf5813402b9cdc5c83ac72551929f6cc1e28607d90fe15985033c1aa3a792a039859ceb129dd1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "40702554f1baa31ca75c5411388f39f5d073d16670bffc10f68674c0f49ebc13832922ba35bcd43c2de96c19ee48901942205abb4083112b3c7d654a36c2f631"; + sha512 = "8fe66383f7afd3e5353a93ed7b38abca70ec1c909dfe27a69ea5eb2a7a785120605eb581b9e6a0cf4586a7e4c5512619abaed0ee60d7743baab2c070a2c5a8a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "df4af3bf6c246314b3eca57f7e30ccf1981fc7cca95a32612934aa0a7f5391c3c5627238331a83c37500d6fc9311e397aab5ac6beaae8758bcc22d8dd16f0eda"; + sha512 = "d12f30cc478db39e610d9a13cda696bc2e88a0105425c6d2cff984c81ba1b953d3c7d7844469ef0cb51b21d0f8ef8d087ca621e183c3ca27e8a7dbc96881c133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "053e570e858aeb0eb059a377698120d6e670be4e0f531cf86dd86490f931c0d03eba4d95763ffd88d6aab916f6d4ac2393596ee08f681f435ce1b4547c2ab7a2"; + sha512 = "927675a0c82deccc56931a36ef7597cf7be73712cf2d61179ff8163b4c6216fd32c59186f8a76d9d3c8b1be4b70b98370ea323eed6869e36fa680ee0d53deeb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d918d1b1e35e206e409991e1eb754952b49e741b01bea5f83b61ee1a345b90af42e0965f2e5919403c25be7141c752498ca388985b4c897c850a0667f8ab45b0"; + sha512 = "d172ec8678f9709958e2f74186cc5712903eb9736cf7dde60b5bba86c144f0e415a65ab5efed2de017ce72c091d5ec5be7421fe49772d64e5afaa2865f52a7d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "43ea381fab19c998d1eb5544811e81504237731b2032a8ed84925eaafa253df7ac4b0a0543c4cffd7b072ea0ed0c0a26d75dbee997c4613863f0bafb39e78bf7"; + sha512 = "452be0d583962b7891b673ebefa9b02208f59beadad96c6dde3f8d4367ea794031c309b56fdbcb036028e59f33942e136417bfc827e1979450b726e64735ea52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a9a246c5e7f4559fb96c92d3f4384dffd8656218c582988da984a7c081c2cd741dd1cd5c384f96d846e39216bcace099453122006b4508a25013716a4ed356a7"; + sha512 = "b12d48bd9e73e439dc7968443bad6b5a855e1dcd87ab4a714a1b30ec0a2c94880219f7eb6c914b0712d7a706afff696f9dd2a3cca3dbef2a801785e0d22b9002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "373f2d8cfdeb77c2da3c88420d7eb9dfd2f41dde0408c0d9c69676114bf109f4c7271eeef3e21f030e192332fe26a0fa9daf4d9e3366fbc85e2626d1d32cfc07"; + sha512 = "26ac7f76d3f3203afe13687a0f61cfd3bc5d69feb68fd02a7fa13ff391a1e0b06532d5ca7a2222bcc51f1e083e8eff5aa38551432e84ce1891e0e648d020a74f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "68d8cd59cf761e2bd5e6857d9d39edac254772d522b5e3103a83a0f133e903c3dbfaa518c8fba310b318b96452a3e4376ce07336b7f5c43b595bd4fe1b4e5f97"; + sha512 = "14848b5c938bb40e9e1f4825854c4d802b2568d534cd777135f5c17a4e17777b35c77d888eb30ad260ce4c6fbb5cc473d55e23c5ea7694cae63c29bff0f24a04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ec9278b7c2ae3c1093677fd38b05377bfa19a01f7b9d45fe6d9bcaec399ed015facd53634649561047f4723d8cdac458d9c73cac345569bb31837fe30c316bf3"; + sha512 = "e5ad3ae3942943d2fd82ff83fde360c507f2b4d50eb4ff87be919a04c60dd410204605c95c439266dfe9ca4200430e2a745b04d5e29ac69d27de3a98ee91699c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "543f75d7b7fa724f18a0ab20d158ba14f1200531f9582e54609573d104d57549c40c1805dad4ccf764b0a924984fe0226677089a1191c77e3c03ea3220989382"; + sha512 = "968967397e661e921a03e473d2be3d25d31d345d2e5501456cce7022d4523185207cc78be7b0149645bb53027d618a9f22f775f01793eb687274d9b14354013d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f353aa0fe010a0897592d1611c7b3327915b78b8eaa0bead1a14d9b305f49e1d91b8fd5a124e723d494f591186fdadda76ba93852dbbb66be7942a078f537138"; + sha512 = "732f1a3bb6bd153762391189376a2796b07b7626567a7348cda08ae38ded10d9dfb3244689cefaaad337306f667796855a91b646f210576476f2f349f7f1d35e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "10dfa66ef00d961fe2558995421424bda7a22b5a97342724e33de1bba8d2f6e5d8646ce953fb7f6a338870df5aad2642faa2fada481c49f0aeaede3be9813ad3"; + sha512 = "8b84165ca3c333f776835149b62500562c6e69ce190d46d6f2d0d93cb7c24f8d0614793c830cc8b070ecaf316c21358f627bf221049513c20a1dbd68d9e59c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2bc74014bcd3163aa5d59ec400ab57212e168992240372d06cdf6d1e3f620e183cfeb23a28a41f61246ae172b24a8fe69eb699b312975f7cb8e1ce490e4ec336"; + sha512 = "dd7dc60caf98ebf0726dab9781f2f8149334f7cf658aac2267b71ae3a80a89126301ff371ef56028851438b33e72746dc24d546563f9f1a680899065bb372ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b3c49a5407b714dc83ea34a669fa7487f25d4b810026d32540ed7a59e76d460d97f2fe282528d634887fec9ec15481bd5b47aabebe62d3d7b4fc70868a37d525"; + sha512 = "b5728dcd3cac5546d05eea13e62d4327170364c03b512364ef1e9d4d9c53de0e3c709d71528ecb15383a2f1b82e072b84c9aba61d054fcb102cbd33a77131d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "aa97023bce92cb2dd450d6a65ba09d36af49870eab6c2823a4221cbdc5590f1a535e759867a1777c0f5f8d540f6be8fab7a1c814d55d3fd0670547c2ddd5e876"; + sha512 = "50f50e79e1d8b62628de28a8cd0c37e90997e6d1a59222e7a8473cd6dc05d50dfebffd185cffcc3aab915fa180b5b8e09decc948635171e5cdfda973f74bf9ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "202319e8cd0fb328bbc1af9aab327b608853ccb516d59ca2af45723b13da707a458eacedf538e64acce94676db6e4a588d40bb50b9cd8e1bf5d732e92c1823e4"; + sha512 = "3425c84784e8cfb8efd56d6c8fe7c4bee995a33b38b3438c648342fa866e29e75cbd7e7f0a1269dd4c4123b172440e76b9615b3058bdf6761c9b75116ea7b3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f765645de5ced254fc74d637b1d7edf0b110d70f894375b4c698e31241fb4ee61400a63a2a64c3688df4b10ada76616170dcdb969c7e26e77997353f7cf0ca05"; + sha512 = "5d304c6b65fe277a36e4b7f697a2c238ed4a9d2702a52befffeaa4fa3782a1d456dfffa3645d09fec307dd27cb2c6d65fa73ea1bcf39025b51b3cebe73d6e70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e46f4c2ca5e1f6198e3bd5c6a5d304df69282fd95e9a4ac06df462e6263b2cec3e9dc1b07d43a583f3a14b3a678cd99cd1cca3a8575f41b2670bf6f9bdb21d32"; + sha512 = "38b3a8bc2a36650eefb6d0f5e3ae4f03443b1aa746db35666288ccd4263e7a60e6803fccb5a33c5631612a2ffa6fc18dd8a564de34b966d3284e5babfb06240d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "9fe5708fd788aed90b59c0b7cdbb73e9ee8f805199a4ff06c737602a234af6bfba3d5542a625a3b044866c598c1b771f258b980675a06b3393afa5e1e88d422e"; + sha512 = "3f8933cf0f99193452b8cc837434932122e01fb86565cf72f5b42833baaa3705aaa63b811af4ae2826ff472fc1cca7798b0afc7aefe1cec28d330c8a537b0e0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7b3ec2007304097be1682f5ffca4972e533d8d93225639375521bccc996e1416ae844b4b5f26969f14c1d880ca369d399a4b1d6c1dfd9d9f549c583e01d3a5b0"; + sha512 = "d2946ebfcd2ce288141cfdc4cfec8e7f5bd6c4f6470d6aaec4156ef4e36a3154f262a38992f92bf6b18f9dbeee43019d23e1d40f0f481ac1060a52b5c5dac4be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "12187fa3ebc6c45ec1ddf9d2320cc434d0ff7ac4c49a080d204a466211fcc65106117a635b771c5171b509292302930e6d3da87c83888e38c099c4a6823a1c29"; + sha512 = "d6781605eb332d61c66bcd07c1ac177e07bcf9d8d24b4f720de95deafc4b5ff68d8271792abcda2473321217e5288daa64576c0cdf37fb7590b366980e59c821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2aafef00064448b5e3f884a956aa90298869c1dcf25b58746e7568fd3cc49e1229d84baf9972395a3b7202e8e82c44629a67774f02b985516a88d66f53beb320"; + sha512 = "7dd72e8b26bfbbfca7f08c0ae5fae73ba92c05cd6d221c87d3257473422db159e31a48c66f96d53ec64722d9f35e7ca081e373ca11a9b9ff8f85bfb7693f0150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "970c8cb83e625976c355c7f773037974aa0fdf25560b1004d1e03a81866cac5cdaa0ac80f40d318aabb7a89bf921b03eb68ae9905c61ef7a7bf1db5cba8e2d42"; + sha512 = "8aeaa498060a40f1c88a9d4bf1afcefb5a6291707e1eb47e27044f7503de4515670c217b5eb1220278a3aa3f3bc0528023757f82c583fc907447f5d700452527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d93448919741035a1d988895efadfabfa41a2a06f91ea6728dc7e952607a65bb3038380e007c2b6f1f2e3c67daabfe16325929d81d315aa48ddee51238895a7d"; + sha512 = "08fc38f050c359c146b3aeeb4cf15032da9ac45fa93a2210ebe6baa673f4692e96154e127406ce65509cf6aac52e0ae550c6735e3dd4f134f5885f5c056619d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1c66b62a0ec38a66dfefd29a92b29c065b089eda9cefd06ece92de0502bf4d80e86655bf3453f4d28828dc4d2fb03996100da5f6da31892ba62eb55be59675e0"; + sha512 = "db7005ba812a980b4f764048e97505a885422c044876ce8640305d1730ae6232a982aacf0a0d2bd7ff1e7df3f3f749314940e7b9583c18dbe4963d8ad64a1ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "44abb1074d87ddbc4ae414e9a2ef744ffa7e2c1ccee9ddf7f55f8f4602cdfd88c0f634b277087aed0643b40f0f87307d8ba06c374b49cf7e24151dace7d4a31f"; + sha512 = "20e614a3cd40234d5208890838ad671b32ea1d601c6c9984a511bb0dd971e3faab0fbb709bacd101fcf8c069f5c9ebbb208c9ddfcb34e00c405b026cd1a421f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "49b055c1a0561ec26ee81005f9cc8f95e7375e5e2b6354febc78f64b9272e7d999d3dcd4777a01f7d37fcdf24cee92dd4d9564d864d8af0910cfc327970a3977"; + sha512 = "c4ce9cce3307d3d0002aa158dea3ec873e260d47b3a423c0bcdfe0180dc4c30fbd807ede1b93314a5f00a440bff71c53c8a134b046fa9e8e08655f7871e652d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c5ae438e2a2523fcf446da39301954d61d9099ff9373b3665682dfd6eee02859c6d228138c89315e8bfb9a41b92001a218df079fa916f07fe034c4591cb32954"; + sha512 = "4b88688009dcc4baec3135f2a313efd2f3a2d1ff6dbfdf62cbb1b9a009288166a817779ee715abed57caef3d46e8d45b1459776fdc9a2e5f5737b84efc5e2175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ca0e426078cf44cc90f3f5bb696de77d36565020442324d89cd6acf09405b36b088f33b4de7ad7ab2d9be9d88acaf16059c75fc8ffe7745f275e021b4b34575a"; + sha512 = "3d81dcc71359fbe93979346b3d4a3f5b62c15cbd9f7a022f7b0fb956a26e0bc029b3abba69022ec2959e284dc52a91a710b16839fc427bb11f36530f4d65268f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b47b6edacd8e7f2f9bf05632aa7cd6ced932bc3399587244d7e806dce77d04d3d7cbe9c31cdea31d40df8a10c9b284a6bbdd246a4bdf31e12aff4d8bf021ae24"; + sha512 = "320ca44d41b370ffc5282f0cc5ff42eb8a190e99417a828baefc78b9a78325ac0f11aeb2ab43319f30c09f6f31fd3dcea5656a21d4edf42eb753dc03b09a30ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2711d46506ed9438ff0528e113de3c1cb10d1bbc0a9042e9b0fce67feb37de484275ebe6c6999a07a9a77b3b5edf1bfae9100d24db4fc2a35f90a61f6a99aedb"; + sha512 = "52485206ca748007b69c8a4a6495b8f1708332eee317bd417cf8a03102cbfe76dcaf57410e91f5fe88c8ba1b8a0566319ac8f4ca192f8cc20e4528d266e36370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "874d0a6991d243b369a0d2b4619ede4d9f14d825944faad22fa997a39466182349d4455180e425d32db87dfbe33f7d584c9c7bf49fa9d71a76a6ff5df7552952"; + sha512 = "3c69a0e364c1dbc34f6c0078f08053e7b0bd0bd57f2ca69d5271fbe19493fc4e291b33a9668a389ae0c15eee48d7cd063aa68a251ac53dc4290513bd7defd525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "09a0a3f8080694decb259619a421d5ba566ef5f002fb24e4c4bfbcb82eb8f697b5b86be4fb35c3f88d269cf178f8b15efdd93f693d65c07ce12d7ee3df98e4da"; + sha512 = "e5a75a9643a5c3d34427a71fca78c27240af06c6298566c2afb57e8a271b901cb439e1969e2a11962cc464fbdd0267c8db5be2fe92a6c909060fe0c8b0fd125c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "0dd4932a1dd9b973234f5b0d723a98dcaf50f9cf5cd957a4782b427b382cedd7a4bd19fb1622dcedfe71f6ee5d60ccca71650fcb756de3cba5aa67e773e73ea6"; + sha512 = "cc2a4743502520a66293053329536841919ad2d08364eefbfa201b1bcb02b515ba7a123d48f3db8c8a1967b167b5ad50830d72b9d0292f00ec7dee0d4e4fb222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5e47e7d5b729186a23c4d7f8a097a16f079b6996e05fde2d19aa0537c9713f08aa34350ed0aa75159c3cf5aa4aaf855b5f5ad6609f5b9f14153b23033bc940bd"; + sha512 = "fa1785e7c83e043aa7fb3211e12f4592f19263b9bfd07824267ed60292f0f5293c43e6c0d3d7c9cb9790401249c61a71936c8bf8308169649acf734eae1bac21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8dc20d9f5db63f641f83404d807d3b4284b8a242618a22af6f33d79f9e736ee67886fa2d9e8efe6eb2186e5b6ed5212d3180c247b132e02b91eb25f07006c37c"; + sha512 = "e19c0d0e74f5eafba8497fc25fb96994a13fd3ade4ae849bf0d6ab6e4782d41f54e122a6260840981f434bdb35b3218fdd93c09af9fd60ffe901f91c5e605e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ea876f0cc7c7c9dc4afc7035af098fb9bbc429d89349f7b5e12782159622820e8bd82935fba81a1da8cae3e4a38bba1717d70d671b2501a24fae248d7d1fff79"; + sha512 = "0df623bfe75ee25c10c5d6163e61e0a14f5b3749a9570bd714ff0f9a95be40944ec19930f5b7aff961bf27e90f0a0fcb1a64afb0dbf0ec8eca8b44aa40aa4f60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ec438f7a85d8730a9c9e11e0c310eecb7ac14c52ad3edb43fadd13083d8cd182bdb77e1b847e585f126167fec4d087563b736cf5300ef297fad171b36e8c3bc5"; + sha512 = "774073a8fa2aeb6687184da42a25e222e6172d1e0878478a08230bc43b0ffb1b00f063059373f42da99dc1aa501c4ec272f501f5742ddad24e8c17517c4a333d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "65664dbf460447d24bdd7e54af5c05a9768b71d5de160273173939f0cb170bc0aa543f6886a6c45d7f0bf716844f21ab5f1c84a554aef5e2cca2a060a9379fba"; + sha512 = "583e8e9c17ee61f466ff20147777f76b94099104b0d9c5516a0d12cb2fe26968c9999bb1f145f2d32e7ec89a7d68fe1c5d02d360d803d0d20736910b54be2fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "38ceb85c2ab2c0021f5877805c800976b590e56005320f60a5d375ee346f1e2441bf744fac86ae4a5513465459a3a9e02287379d24baa4ada3e86acadfb82753"; + sha512 = "10a5a51d87c3fd4f9e982bcfb47a6452b351ab86b0042146eb3dd697cdf6b17c5589ad6ab4914fc1d18b52acb68718f74a48d4bf9b94b1f7a82235a33627c92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "976f841c1cad0180bbd18f578393d61a3c0c80c251aa67d22f8bfe247c09fdf719ca7de003db9b3b6aaf941c8e1284c7ae407f25c18e4f64714e2797de08e41a"; + sha512 = "1e655cd47256b3b340c9878023e74ab925a359eb131817b8255e362e243994dccaf1b0ef91b1a96a4ec497a2f436419161de6a1ae773c6b22852f8efda2e71ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a7cb8203aa1ec3b0f2b436774036f82b71940569eaa553a476ca6133e13960fd3ebd00cfc9a70b2812bde0f388d054b9a219fe44522e19d9bb113177fffa505d"; + sha512 = "1d587134c40405ad3339fd6dc45b9f4a41182f00d8b24b20d073cceaffd00b61b9ca9708b0937513b4f5e4ce9d28072a93421cef9f516ae76568e6c5dbbf9c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f36b95b08786751a90c3d19d53761b971d0043a0b3049edf40f81edf629f87b4b9c9f3bd2cb2401149a41eba883eefe1dfbea5b62955b94659c3ffb982687e5b"; + sha512 = "a2f4a29a30c6a6e46659e4cd4b8c66c8661d94bc49b0b494839feebab197c67cefeced7d161b60ae388b8643f44669370274dcf04846e878f61cfbec6bc71255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "03d0171327097bdde583770e10f4852b7ba955d7392d1997c4c82bce781b8540157665c641497e69ff50d7fcd9d04c3fa48d6f22f867197b71a5d68e46a31590"; + sha512 = "95a01d3aab89fd37beee953cc3212d2f18a45293d027db8847edaa4935288d3180f25d4e8411ffee8e4a8dc1c071edef17409f2bd981225e84a1ff3f726f3863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "75ba4ced40a26fce83ba3e688d260c3becd1b98e5914f525681c4c04a7d7f9476e45fc12789e7df78135614113deb196f2403085d605bbba061fbfef10027c31"; + sha512 = "d35d2aab040b0c8f0619ce904ab55dd0cec0498c34836cb9c27ccc9f02667c5368acb37c1678802839a9429c9f716c7b470d5f30fcd4b18a61230b095f56114d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "dd741fd32bae0f327a19d019870ee587ab24b6004410cb41e0cc6bd79a3893647c14216ccdff11a54b16adc6504b95cf414905a5bb5de35c250123f9c078a964"; + sha512 = "0f6937717ebcf680e9a619f36f1883c9bd3a1c3ae9031ba25ceb41b5a866746b309ebdcee447048a4a6ba4fda29ff740006f08c98d79d5e1380abf239c9536f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "eb3cc5309e52ab663f37866089c6f42c543f640c6144bc66319a850534cfc0732e545b10f5c56045683a4c61943d59e8e46b90d795c4e5c3ca80e30f5a7b04df"; + sha512 = "2957ee8f89d219f6e8926fd81e6414e4a52f46f5ba00ef729b4996b8f34a7d436dfd1303754ae5d06ea4fdf555dab2c14b498fa94026149118a7f74ca198190e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "74aee78453e4e78c4bcab739c363de3d6bcdea7d23583398ef03fde87b619d54c3e478f3eeceacd52e3f4c7824240c4cee1c067ee6ec8d1db1c29f5862a356ea"; + sha512 = "0f76ef41860cc51645f09c427c5759471475086a65a15715e8b68327d71be049be1fe50561c66e30e9858f4dccae45417ca8e26d373d81693bd0ecb2b12ac1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4d11560b237d4cd9ce5b3fba3f369ff2e8273939d5f2ae85a6f2bc1a872de413ca58c16c15818f5588fe8e52c6d103c92c8755003bb2e0a3875ca8aec7adb908"; + sha512 = "6070b0480e965645b6aed071b886216974e5a03574715edf002a0f83f7fac4a75b20fa0e1c5289a6e3604fc4db08003c454a4ec767fda18cf92a72b051b66ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "625455a5c5043e416f66b65417e09982e0e491abd1c1b28d9fc63375d9cf5c29c9d11be9936ea2db97b0011460e832d44f7fc5a3cfd9c95c95f4934c3d6ea40a"; + sha512 = "abe4a71654c0c679bbf83913c9eaa2e028872415ab38627ee79aa5aaad47695a306895589b218303d54c6394d7c4afd2dd7bda536075a098fefcb13d24114a36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ddd26fd7e5f69663e831246ec9d71dfca4d4894a00ef22d72594a8fce9c6a230bf81e1ed9bf1c0cec9f86b0059a3b87980aca31db4151204419bf174c89e2cac"; + sha512 = "a9554fb7f97f7d8bde55a6bc1755851c6321bf3ca8512b15a6465a8fd6963fd1999b2960ac8b462bf887c901af26947f304f55dd12ccd95e2696e96bdb89b720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "eb7bf00fd7ac6521e93f7fc87373e87d5d2d58fbb82a76f8df675c64a2f9f443ad018e47d86d6f86913c166cd05d6703c3553e82e5d27ba095bdbe7188fd1e96"; + sha512 = "21392aaefff4abe4d6f540918a292080325ba635465cac18113db249f52a949b5f15810579859131ff5a19a75933337f830b3080cabfffd3415554c769da8b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "98cddf287453fd68db2f84732dd7768ebd0a72f492cdc0578cfe71a3f3eeff9bc1be6161b810efcf22f64bfd2f6b52f93aacade45df55380d5d9830cfc1cbfe3"; + sha512 = "d0969bdaf97b8888a1953d5c44848f80e9500f795eff456e87f3031a066a583d42b4e76b8478d1f3cd08d4480053fffa703b0522e4208d3291923d90be92e37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "35e3f27b7e2dadef3e93239e6530fb1ca5ab5f2dff619f24f8bd66d7ab5c95b23da1d744769e99fadbfb0eb94ee81a5f5db76f2eb842cdaa4432bd0187f92b4a"; + sha512 = "983272eef924b86872b2b76ca922af33c568d89ff97bd5415782bb66d0cc3f83d48b7d10f45c501d0acbed8781b0f6dc962ec6be73dd34cdd3e78ea3494244aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "721d13aab5ef95bb3ee4d7d52c1e80bacd6f372c2e68598cc6a0c146fc6abb5f2f52248e9b26bb0dee6a88fa68517bf7c1bc28fe20d9c9d9faf7e49f9524a0b0"; + sha512 = "333f35627c6cf52c558541357bac83382597a622b9b6c669cb918c1950a314c85475236fc1961048cbc8c0d390800d1b7fc71eeaa81fde5124c017876c62a378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4018a271f732d96d7f61871deb91a08bea47a24b0f1a5b4fe2212fb46c23bf3fd5bef6bc3871ef0ab0303c98875671b1fdd1de740797005b6fd0f5bebd874048"; + sha512 = "a6f9dffdb00f28cea349c40ab6681ad6817f61c1c6ed7e8980a8e4b33317367d1946baf0f6fe2404ab3b07889336a9676d87bdbc07743ced795c1f8f7bfa7a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ce71174e9f1e1f6cbe3ad4dac63a06019ecca88e1849ede786c19cc20f1a08ae32ec99913f49d894731b7975896326a1f96ced12344d593f9efe3230412c125a"; + sha512 = "59a7f64cacd0a2db705350f36343a7cea81c68e54500a02dbc596e08705ed464a1aa51bb239a742f9599a3088adc8d782a811ee79937af987285a35aec74065f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "774ae2146f629550e7b3eb36a5e27bdd2a5aa845d8119f5ca67b181aaded964e9609f9e3ddcf212efcd8baab58de66cdadf0bf7a5f088b9a39e2b63f53dac48a"; + sha512 = "6de1516de2b9ef25d24684d0d912727cb2b424ed58ef5c87d0d2b4b707e10975e84cdf716e5b828771d05f3cabac387205f1846f549356017646354c14d3ff22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "942d12625cd0063ffe09b1c6fd83a19bddd89220ca37f1b78d88fb184e08eae044ec3d7e545b3dc2a3b020693cd62a8f21f10e803191ee2dc98b538e9ec57f27"; + sha512 = "fef8283a1a5b3fcc5ca02a434e6008b601085feb3ba5c73c5c60a1d8b3d31c1e3338a1277bc78fa09a3a69150c6cdb9a5ee3de1998289f27e0f38aa4eb779cb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "0588b18c99369288e188dd329fc77f73c04bce1fde3acb1a940dbbf01223ee8e2b852fd145e531841d950e53d008fe8e24ce681f2b36f1d5afd434e96b6f95a8"; + sha512 = "6c78e0618b9248c45d71c8f18241c57b8c46dac25b15a6fd4adc3bbdae88e2cfe89b638980c567adcb93132d3ed95187db68e6570fcbf0bea7dccdf87b65c7ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7c0c826eefaa3304f32c4a817a4913417833ab56575ab577d42391421a449bb366168cb5f62e2f1f1fd9c551a32875484a77462491fbd5e274adfe51b0584a9c"; + sha512 = "bfe8750cb89b6a29c4123a8f7de6a53c105e898d47c2eff29969d424d1e28fd8d7d99ebc479b7e8ad696e6b91409722b319f8f255e9ec2ef425c59122e50cfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "9f8614124d669df9f0e539bbd14c9d99214a012128619c5e6c509029664782bd75a887967f255bd886da0a645c47934f53317ddc20624820c5badfd08724d44d"; + sha512 = "85e8a7dcd5f6e3761956dc6eb556248d9668538dad511ddf3d8499ecc55301de61e7dc42fec0c0f3c56801eebb940c88ce1d2511a16afa21f740b45409115f6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2227eac2f7c71a627c2cde8f545011a7049897256fa7ec226ee795576f35f06eddd7333ad9bfa2a474023cad5029c9159d6904db50e80094c3f405f857f4ccc6"; + sha512 = "3f5daf2ae701be63b84eea53903a582fae6095e9377f49c750a2bd404d8247c5eca4852d86b3d4effffd5367bc965c16ab1bba939a245445b0fd0bceffc32ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3843eb3b078bd581849615ad8a8b936835b4a85a6ba4ba33b917d9ec549e43d847e160ff4a760775dc6e2c1688674f43e16eb9f561c93263afd3e532a74590ff"; + sha512 = "0bc074a4953a34f533d7867e6ac374402bad84b2a2bd219971e80e40195f8a984f801ed916c761438d8f34313415ebedcaec8622d495b601cf28c8593bca90c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5dd55e468825c8b13473c57c9ed6a24f0920364ff339136c7f03b576a6f9d473b63c173f95c597365d68e9f9afaa653ae1e961d5eb2eaa5c670f48a4dbae5466"; + sha512 = "c78352750ad3af2cc7cc6d035124ccab4f46ab0d46b178f6a32ea92e79ff5b8ba5148415d9ec3e08d0b1f7c4d4377e62d174779f164b730b0a4516c2224627ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6c45af1110563f53e7ad536b266e84b23e98e47eed4a88d91b4ceaf7bddfc81c54680a93c00ffc7367a0fb79bba5e29e69069b0e7d9cd9fb8e1b2375b9e489a3"; + sha512 = "31642ab24c1101dbb28c9f0149754461eed6d8939f59ce5ad45c1225749c550fd8dcf23c42bd3d892f09ebd316dafe59f92e135133ebfee4d642d33d21ee106f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "58ccf32e884cd7d2a2258e12f3cc89f2e56e5bdd367aa44b944a656d03732d936a4e64d308ac10039bdda92ed491e3369241e72a189b936e9fe718c3ae373af6"; + sha512 = "f864c6c416ac77fbc541b3c0371189c0d46adb38ef87823a47ec56828efc87f43edc4bdc74d0bc12d9a1c3b02bdbbc4d2072ac9ae06225bca65ad4ee1202533a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "04afab7b77c679aacba048b73b39b661f47ef58327fadfc0e22d7d86111e3c43fb9bd63e13c0c71b3b789d2ae9a24f939eb046acd189b5b88677868fab24a6d5"; + sha512 = "91483b673a8d32210a3b0ed14d8289d5bb5ac99f938de80f5dfcb0d880507637744d3caaa77f28eee639cf98ea82ce0013792b2067234d2013a656f31a22f3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9fa6f4cb7de48647aa239192d3fbe97d40f5d090b8fa47c11e76cce479cb4838b28345642215d1ec049b0bc76f334895c387beae513593347cd262f9cd830eac"; + sha512 = "6a6f5447be163eb93430529918d241e8f0156b13dcec6a25d1ac209cad073d54920c623363f5e4d402603b4dfba5f1a4be4bbe128207d17afdf372f29e6aa6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "418df497b4e51af407fbed1ee83bd608cd1fe128a2d3f24a3663e57d3c2675c025f25fee213aec73b9f805cf3e88b8bb979dfb1e18a998b2054c666092e52b08"; + sha512 = "e0e5b3c58cc76896e959db56d716b00e905f7fcf6ce9a55e5232c7cbe18e1c973a87769462945d7a740b2077a398b6f6cd619f7a9cca2ea5b9839048190efb2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0483583dcd3f4b25357bfd6807b757b139096ddfe68752e65dfca20521e3e6c12b66f50562954d79af1377e45e4e59748adf070b6ec20a424467017757885762"; + sha512 = "2ea257a82bfce1c2bb3fe4175fe53c2c01aa6eb0854b4c66db5bf4c0466858ed87c8c5bef081977d87d0f38d3682ad24104ba6ba96983f7b02414a39ad422582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "64ab03909d03ac497bdcbceb0c17ddd6b4c57ac453ce9125ca28a9458116617737c413f293e42b83c27c998b9a2352b20921d0c3ca5cf9dbd7bee717541568f6"; + sha512 = "471abe8a5fbb78da0eb791161aa6d10cbca5ac40344f76dece294010a94bdecce15a0ee0382f9e1f21cf6e2805f439af5153ce1d0e3a913901bc15d3df7b5af2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "faa55bacae7b3c97336e3a1e4352fa32f504392b56d42d16d4d544083ab3e9d26503c28b3066298f7fe11bad4dc81e52241c72558984b2b4b85f88ac1f4e8ec6"; + sha512 = "689cbf4a4e727709364758264bcf9ba7870b831cb5779ca4c601b5cf5931341169468a04819a680ad7be4a1ab03506e379d77d1926c830e4035dd9581c997394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "92866b07535bfafebe35c3f193bc0f61c8952f1fae00e66530abbabf9268ad3d06ec44fca332677163cfa4832c6990b70aecc6a80c1448012a9695901185085e"; + sha512 = "baaa6643e5eb9811b47b50a798af8774fd69fde12a036144840887bb49ce248650672942a57b83177d330aa33d890b3b49349dd85d0e7506673f480d54fef80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7b02a18303661b4e3d6ad941f25d454fa322e95af520c5ee9504364dbbdd04f498c195099559bee74313efef02f46e259f43a54ef8036378ca27611316970b18"; + sha512 = "5fe8264f5969c30e4eb356382e4518a3e49b7d58e2a880dbd9e2d7eed12455892a1ac06b8785cdb6f7cac7948876d43faea8ac8c67d8849563de260ae155e1f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0d60e2c69bb76bd26e4522e4a216d05e47f822147c84b360bbbb246a1f9f4cef3f823c066dbfc35be660060027af4dc0eb1cf4bad9904ce32a40799b7d616237"; + sha512 = "df1f3757986cee6b2dee6dc00525e72e58933d5a9db7214dd098a11ef51041da8fb39025c39eaa052114eb4216f76a1109d682591bef19d7b4a6faea6335d489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "21c5e60f9536a360222d9d933bc71f152ad115379e897257c56fdc9162c681f98d612e40c5a877ca859e3353b8a3ae193d7c938c262ebd548c3741e04d83da89"; + sha512 = "f8629cf29ecd95f3f023c71e7ebd75c088876ad593179b95f583e627db872ed34b490af5da2251eefba9549ce0333fac0e3257089f76740708aacbe3fb3caee8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "6899e468cb5412ab0d9e29e0160239987839b897b878ae2f4b0ddba13f89e62dff716f454e23635882aea74e1c833259a88013b787e4a908feb74626ae31f163"; + sha512 = "18d2d2d2f8e808ff8c4ef0c0f2c58ac0e170e1cc244c3b06ca30581f671ca9cf749c066c249460242e81d516763250ba6b70cd31b96370df7dddb02db88fabdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7da4f066cfa181d81f792db0f6772f576306248ecf68b7ae7bd43989db243427a2c81dd3488fa0fddb953b4d3680f2bc1802f8b0c459d99e6df791476f83c905"; + sha512 = "73702c3e0820d508291848b0894b0d53d89a7fd798a0b0aa4155e956c796f5d8444656c8288378ffeb24988207da9ff74a71931538abbe2c339ad4ede86e38fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1c317e4fd9aa4fa0fab8abb7b3f9b38822a4e4ed84c513e4c6714f1726e450fdfb5945b2954820a13079975b96275352b43a1bcbfcb69a17cb2bb241ce0a67b7"; + sha512 = "12daf00fefbe27b5388356255a6d67307dbf43bd326d294735d9838a8b2b58cfe2deab391b3083d281e56a4c2f25c110283109e05579946b995978a61f4cadf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5ff20af423a327ba0ed9ff700c8edc2d543c791593125bdba92f513a26826db749b58bd25afd8dfcd05a4edf312c3326bbd9e8aa63a2c5592c3ef828e27f5836"; + sha512 = "3f769a9769202ce3334cce7dcf9fc4a2798f2d8572e99eb5324d042bd71f865b1a8b27819a6854a1ee91163b6cda82eb6bfe8c174f2cae2fa5f8be45f4e2d54d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "fa45afa676ab9fad755b3cd256f2d11f9700719f1ad48835e07b870c7604c7c14730a4e19c4e9244b284c64bb668642fb4fa0207244e0543baa5d2387ee9c846"; + sha512 = "f6a2e1c64d834692d1b15d653a1e6c05d0572e635e3b0231d36a3c0dd58f3cc4994af6d5e025c0ae6a715eb318f4eccd00ccad7c3c097996a8bbac79bc100274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "19351061671bed7347ccf3977feeb4faf250a0c86e2eadca80fe5ed06864f081c76cb16456420bbdd53295f529f61cabe9a2aeabdb2dce1add087bf1f0916b16"; + sha512 = "786b490e0df3788435be32252568cc8978c5d06dc2b6749a26026a6b0d62660825b6ee35a0b01f0c1b0757267a403c150dc963899a67f2a57e6ddecea1e5d4a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d5a765a34705dabe43aca3fc5216061e9f17615b8e54be2de34db766f23c6ecd62781a8d8cd18442c5a41191545f72faab2f6330a5a0e160dc1306e30bebbc26"; + sha512 = "92c487200f1cc9189ae1cca82e28225f9c30d9c63ba022ab78899a41887af3dbb91ea6a534231e080e4ffb9c867849cc30b234e88bf368540efd1ba619c4ca3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "1958969e36cd3b63071725fed3bff2bf9489290d380e690d9b09a6873cccae3233b967cc666fe9639f85ca194003830c91763c0373a9e015897cb5744200eac5"; + sha512 = "7bc40d3bae027e87d7f08a542e814edde2f99fdf777e6e02f5161742bd3cf72f11801dfa92a89b4d9b75b03ecd4513cf90d6ce25547a110045f6a94d35006911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "9d4d1c24b0336d042b404103f4f3a59d073c6ee612ae669ca667d1cac57b0f936a4d2dcead956dca5390b910e2141c2c9ecfa7b526edf1581bcbe1fb99d7ae32"; + sha512 = "dd9c399f39e50df48bb642859d78331b41f77d4132cb4fb93ce0c609c6b900b50bae2a370169543682769b96d75b31c795b545a2ba003c6609e2bbb170a62b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "0e87d8792d4ae45a9f5188065e3fade5dca047eef5e4670451468cd9deff4064a9f206d4ffc2fcb231a97f19ecd7604d028e577069a48bd447d3b27baeebd03a"; + sha512 = "2683a0e7ea89e2eabc8749686b0c4c37f13c40521927a091653ad8ad129bdd3da869562cbbcecade3b686ad1e111c7b8aae69770d67c7a5dbca7d510db1aa45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "44872968154009726fe0ab81620a8ff65b67dbc3b8e2191c63420c793c5bca3bf7919f3b53afef048fa38b698ab13fe718d5d91b1d03e0e6f7921ce8beea4d06"; + sha512 = "a7c69e38aae2303785ddde5e50dcbe0c6474cf52f0e58241674671be67cae286442552b68b3fd6f5b83d60298228dc942050cda13f34347ec8bdf2900b88cb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5f10561b78d6b6932adaca728bbdadb2143ba88fa149678811f74435cb312021d2a5da4df6081dbf08dfb203e3ac68a0833ed4eabb8982cf5965db02116fe3f8"; + sha512 = "abde203fc0b0f869224b2006337f57c59af85e4216b8a7917524c9de5b23ea8c65539e7b58568b5c6ea8831cc6657b3b15a4fec73e3a32d0a67a82c8f04aa8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "8b59ba083d00a16ef0a0c38cffdca64102bac770d9095b0bfa0cce55fd57c38c0a74cf41d1e66838806d57709082659eaf462de167fb55bc3d3b78f24558ca05"; + sha512 = "d5fffc89c2a1312d71d289d17cbe8d5f388c1dff3548fd2df835e1941fcb968900f24acb5c4bae35c714fc05de41d885455666da834edb3f86f06fcf4c65a230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d7758e213d282976b50885ad10240e594f762d4c5f0643e5146ff4c0b289da645d9e1d41206162566175147f83a6589be19f64010625b0941b5a69eb39d387bd"; + sha512 = "809ed3e4d2a3d8a58d30aa5230ca37e0de470a3fa81e56c7a0f1f3ac03471a9ac96d7a11b3340ed86e1b9973a73528a3eb564146103b63f5127280e0354ce883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "97dcf8fa04df58333420358f3dc30291e5d2eddeecb7e4b1f956e4508ead0dd5ef83dda2725eed02708ba8d9c4fca3f8a13b70d86858f3f011a616d80a816b7d"; + sha512 = "689d9ccbdae7b47882c73f16fa9e448e7d9e205be973b50bd70bfb2c8095a41452a7d2795f3c2b8d79d06afeb0505e0b6e454ab42ea4fc87f3975cacb062208d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d463de168e07810595ba7171454576b0882ac28d9bfd3b9e315b00ace8cced905ea26a38dbb83417e8ee0df2b03eb3408d810df13ba68735758c6d14f3ad8536"; + sha512 = "53180bcc3e3b0c2cc8f57121314a8d843af2bd609ea3ed0795f8ae41b22cf6fdab116220b038995a360776b1f97dcd9a9ba0d823f577e715c252ba35b967519d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ed7ece1863ad330bc74f14185b9dc94d62a9dcaa83a94c6b744b9b8caf2e3d21fd2f0590890f961205062a8b5b79d5ea43c1e67f23b328a125d581535247e06"; + sha512 = "bc19b87813b0dfcf9b7a7b00b5ed0cc4017a9102ff7ecede8dd4d00d9f24ab5aa528f4e5024317cdd5f36a8156685eaf2bfd9418abc3c542666bee8ad236368e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bc1692b0d04e5b3fcf6dd09d5dbed9b2f40d0558710944819a394ece4cec9488e1cc8f588bdba2d2cdd8f35513f75afc47c07890e81a242a039e407bf029e72a"; + sha512 = "06cc483c97ed2c7b357b4f56252569c7ac92bf44f4bd389fba0a0a7c735af8ab889c6b79c08ea477fd6c0300c4f8be62cdf7245f6adb54448da993c9fe34d99c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "4d6c29e5a52822d4b1d747f922cb117d068e4a55c281df4f563c478776d250beb66091bc67d65e5d584e93bab6f01ecfd2d30013c7b0e0bede1184f88c96263a"; + sha512 = "4e835d66dc8a299cb3ca0ff8435b302a4be8b72d858bac6d2747ee4899bd7c1b5a4a9bd4e6e7b8c649be890c80307b84888ed61073fdef0df8f0e3ffcec1a151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "00baf5f4164bd0a9bfea3b9d94976688dcab170f8c7a79fbda00cc026ba58ff293d258e50f40105bac206373022d7354cd51d56fc8252b979b6d1f588e57c7c5"; + sha512 = "edbf71dc77fbbe34abc6946ef30c360a37df3057743966c5d01a8ef29e1abfc7715b2b2c8fd9dd7e3753d42437b7795a05e75fe32399a843c2573d78bd50af54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5471902249f97c29cd66ed2703356f1e79a81c7f33eea14634003e335578fc087032abe2f032b763031db42a7564007c3acfde9ce6e337c271f0babab75fae7e"; + sha512 = "d70b96ba3ce553c9b67cc4fe5e874d1064c14b592e032f6e9c15ef6e753ddeed8cd419b6aa1dc53b275accc7059ea76e59109059f79ffc5f2594ebbc6d86e6be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2bb21a3726725c861492d501876e6236dcfb1f718d61fa12f50fe512c1a391f61db16249ac49b95fc6ff8f31a12de3b70cdb43cc8c40f2210f0fbaf93b31bd85"; + sha512 = "6fc73ead9aa8f1555d13ad49bf9176056fc24452d40368e77541cfb0d24fb0671abbc5664bd9839ffaefae21043ae3c5c6da31d17368240088b332977cc07b7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c357161871ecda52551d9961dc22d85aa310fbff1eba00203efba529e3760c9cafaa7aae93cf84ef8f122f1ece4fa2f6660ee72518c1ee72e38c967325a41d03"; + sha512 = "372ca800a57cbe53ba4c4c792f85597b1e196d452a611d26e14d328f6c36d846f2db0e80d686f3aea93e6dd352253220d4fb98f508944147e425cf682d65b807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "951e0247b0da69601be706dba8ffc7d701a9c10020ef70e37632379281a2259e02c6631da634c6565bc70d0248a7acd1aac961b030c2d141889e0228b8fd59d1"; + sha512 = "d74d6071a9345470dbbbb8502818ce6349283d5e3682d687d43c5dc0f79d7c0c3b321c950568c4f4b85d5d415911cb3cb900a05caf2dd9c0f79c75eb67930703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9401ba099715e1dc977a5e912ca6886f0af7a7a715fdd8275e7cbd383a94ed35dac9919f281fe0e20481ca31d0cf5c321b4dfb09d0318a0e5c9244d3823c15f2"; + sha512 = "c2ee16f80b733d49e5e466ae07b52915f48516dbbaea5eb16b814dcc342d5df43da35066727864222fa4f779009351ea957bea02a25eafb4add1a6bc2b10ed07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8e204b19ecc12c8273414d14b68bfbb48ebab18eb8c76e77682e3ae28eafdb063755d13ab5d7798727cd71107b588cc39f8f2e33d01d5418434a212bcf38af60"; + sha512 = "d175ad469da71f969dcdec57241b9258b9b40f3313d8a58d7c9883a2cc8207edbacfe441a8cf347c82a29d52dda40b1b02ba2770653d853f1c3f7423f81a8916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6c970d1c90c2bc1da19df2beeac9f7ef19bb075812a3dd33865bb4f3d0d26cda5d0645a432f0a95cae0bcf6cd0f63229f7288cfa729b4ba71a1a177ca6b5e1c2"; + sha512 = "11191dab140fde70f88769a84c3aec15453bb555468a51e3e10cd61dfe0df2a375c49ae35a104bb5a160822c7c341654728f811d9b630c02e6e7d08667dab38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5130a89d187dae0b622e557fff536e6e01ece8b139277c78f8ed57abb6a402cb24171170cf1f1585758389ebd17876835f80a103028e699837475261b85b00f3"; + sha512 = "549988f41e881561d98092b3c772c02cb2e8f1e6ba67af6234d074f7f451aee48ab4b0618e237a147d44f869e39aaf701610f54a8f1a7fc2b22fdccd714b9c00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bb967d8ca372464218b3f38c8e7b66660f0a40eb95c067e3d020dce9da168cab14a9437392a0feb5a3858f2cde9f51678b28537d42d1a05cc89821c7bc492dae"; + sha512 = "7683d28bd7fffc66c428ddcfd4ea9d95d744f27e5ed38192ded65a482ff1b67a7477e5c107ae7cfe7eeedbf6a05a9248855a70d5093d837943504c2292db4fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ec1de732e07863f6b89c35e74c052df882b877c557abfcc53b69617b3269f99d1747334391befa85591b46350fef57202276eed04a97495406f356eb6c428d05"; + sha512 = "b85b2aa1d2e98f56ede47a2138e50d5fb68fd88da92a69325ca408646908090ee660b01ba6fff62e8c0bbb80d68b9e554ea3848ba51ba056c25ba9a8886f2589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ea12b5e6c090e2edbe1b25438bf07f21edc9f4f63a4b6ddbe10465ec6351664ab591c51229fad8c04017456e6ac495ff06820f976fe433710a2f4f386c0cf004"; + sha512 = "6d96d873a670432e8a4252784965c54f1f8a2b667a03834da653a23bb2abd5213b92ca90767dc4f2857aafd97d42d2ba7678ab76c294c848778211bc51ab1742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "92d15a1aea67cae4c4c1ac9b5b084f186502006f8850ff6daace5d43cf02a1169fdefc5ce55f86fea356cd965290b263e2cb1fe13450482a7fdb4836cf18e77d"; + sha512 = "bb6ee71aa9d7ad5672936cbeeca36abbb024b4a7e0558f72f8270a7be4109c5cc6427743dd5fac5d723ee8b960008ec5771f8306c0e7e7f60e170761eb92c2cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1de8cd725fd50fc0f551b8e5ce7c68d295826cecf36539a64dcbec8f1796c87597a54f4ddee365392c92c21d18c460e3196d0b308232cc7c18fb26518b2318e5"; + sha512 = "ce1593a3a16db7264b6d249315aa6f16c0f7bff93a3ded473c79f3fc8c95e9594155b0f56d67582c0f090f2763d9354560d92414f1442a14f95ba314a29e1f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "caa72eec283e962aa8bf9df0350ccb31e62859e894adbd8fce82b7bfe309cff5d2f66bea006baad34b93b5861855ac21c512ef38a0321ca49b196b21433e2814"; + sha512 = "e35269bffd06dda7e784ef2be57c20757cf1b2d717a73fd940a297ff1c4939962accc33893454301c86b3803cd1cba5913d2d0d606293ae8ab56a3ba8911301b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1e709986af8046c51c380ea2a1763cecb0f050074b4385e5e2814044cdceac2829dff1efe8e692dfd40d2c3d943ab5235ead273b052422e2a8c053790ac659db"; + sha512 = "b76c49eee827039ee2c5c479e425d71e18e9adff7f609f027f842de3c359650ea0d74f1f143d1c686da36c9e688600faea589c241a83587e13b8291b4d67ba00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "91fa3b71f34c068b7c54ddd36feb53f3851040d85de34cbd5a28f5946cd3bfa81e98224035d6218fa63a1f584cacee9728e6167eca3ccbc25916f8b6bf3c917d"; + sha512 = "ecc342e40471565eb2cbb8855afed5561e5bdacad623431a474cbb85b8be7e0087b78660082251d0da58a40d628005e4e6417c186e4c60a30d16658a7b945738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "db99f01106489e4c1135c4a34e86e9215fd280819d739d75c902b295513e294cc270e07a4c85994ce3922c5a1081e2e127431c6d8a72011281543f1069157dcf"; + sha512 = "ef6351f8456da39ef7bf4a2d85bbd828a0fb8c65ec3b2d123426809c5d6bf1c1da99291296e7bfc74069c0d1cc1db4e8a1425545f9f9530e7b4183fd6f25ecd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e68c2b71e55f5caeaf34a46d2ffa6f50d7d19b04cd4b6b0d097cade0961f9b53571acbc5ba4eafe7af1ced8437f7d442432061856325fec6aa6d3b679325070a"; + sha512 = "6783198c822e4c9f246e4420b79b11470a2fe6edb2912ddcbe479a407f54a209f6cebc83bce8ee7f1363df802b5bdd29f44c5e12f587469237c35574240748ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9635821b0e53b384de19f77eb2d34312f8a68bfe5c128096799cd7f80e18d43d66ffca6d576d73c1ae3817ec7b979b168fb55e905cbbc4824b08bfcd93ea5af7"; + sha512 = "2f2be59d8caa2b78aafda07da4a1a2a0599bcea50bb99ab9b3049e14a81febdc0f72b506a79555d6b58ccc62e2538424eb35d018b3fa25961b3d783937abd1fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "73084cb2163eea8bd7325793287267185d38f2c83d1b803fb02f218c5ade82f6a5d78fb25d74418ae358ab90b8dbd413204cfcb732bbb979f7111f2e6480472d"; + sha512 = "f4ee493efaf81881e76664540847571f7eef4dfb764b0e92b4437404d83d8cc7a8696ab0292b9603de49847485b469be6a22361b857922ab39352a4b76a3fcc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "12ccf678a8c6006ab70a0681779be3de7420a01d6b418559dc7f0b6cad40270bbc082f9fdcd03ff83ae06547a8743106d8be7a5e5378bec751d32eacca709f51"; + sha512 = "7cc947f307711338fe9d4b57b580a7d33901e1c262a7d003ecf29e94b7fb3907ead9af4fc96117aa44c6aa829f42ab8e79c50e7274cf4442172433c3899d8d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d457133bb210748e6aef9a588dc345f440330c2300bcd961cfaffee0d9b0e7e2728a7194638096c62b7ec736fb497b1865f7a2da1a9f87422ace4b37261856f0"; + sha512 = "d49040bea058cc92c81db6438e6a631e1c0ebb8c27993a06ddd95c20648e3d3e0352a7424a8748cbfffa22216cd06263f78d13b69ddcb9821a9b7bb01d540695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "629223cb5a84acb1bc9dabefffa489590a4b6be55f64a6c639f9196ddd93f2d51b5d154ee4488a54a87785093c0b046f03f1a8aacbf017ef4daa0237c14f6812"; + sha512 = "b76cc94c9792ae728f8bdd284ca7e1102e4130bb78402052a748d26dabff4b0233c302301ec9b6b4076bc939fbf931fb0303f9e7f8881511e325b69d86955d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e3a2ae377fcf74a29c216e4d82e969993af27bce553050d7318071eeefa921524aa8e3bda4e06391fd0017d5b49b17858bfefbba76e1dc03c3061899eca8f68e"; + sha512 = "3843d8c6fc92aa99259f9f32778e35ca436fa3d36965a175a1b964e9d3fe0bf9834bd8fd3cc3c65755260e0d39c5c21a7d88f54a5f1c81938890ae82545f5291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e13549b23549abb978b1bffd3653348c982f1cac38d69d16814e1e6cf3b7ad07b29a4844f2ba5d76a1018b0819ab889fa638f662d47cc63e258f1cc065a44a26"; + sha512 = "eac3443ecc5d37fb3a357247bb5a4dc1fb0807071a57ee6c649b1405100ee728cb7e476eda792bb55acc96132708a652b6e83eff0e764f2c6ca9348f54c41cc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "70ee2755b76813e32f9c986ddd81cb23945bd7a25593193c0243ee6eded7141e4657b1549dc0a376f9e46b986fdf9605e6690463549cecf3435507c0e2a8c65e"; + sha512 = "aecb0ad35bc320216526a7bac0794825f6f266972c4c291a4e97f81af747bf462f05e662e9d5bf77d1090a6bb65adefc5a985dd71f32319cd25cfd0e465a7791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "37ac67a3ef2b9a2ccb23a2cdb4557b38cd7056808bf1cc620aea664d51406fb24e7bb623b74b8e14282b3b20e3ddb3e8547ac0daa9e4f844e5eb275e01479205"; + sha512 = "a26fe81ec4a5b8d6164f1dda9d70eafbc2e1e9697fce29d7de9076f0fd25d0467a5c9c02002d51066dd0a3ff427a627d18735f4bf520d1c861ac77c0357717dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e679dcbaec7aca833f3a4cc8c3f2f371d804983a43ac8a5f08911873ea688c2c1847d89f27897b76f16f75a4dc93998c565f1eb78285b5b54a216f19322fc889"; + sha512 = "c28fffdf9662c0e8e3ec972dd9ac7245be0f4097c0694a6688b7cc422738cfb539fd15753b59b2208f904e85ab037698cd21d08b26c0d9c209088c13b0e91f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b17f433ea41533e3820479c8b00ed9967f21255cffc130015cfc69ec050aafe4952c5c3e112de845092bfc74ea5f3e94d6af788c82ae86028398a4c8ec809395"; + sha512 = "24fb7c5dfa3ccfe0ab012c3c8c26b5be1411ca8a9204b36c1592017cbb6712396ed589b9c0050b3843e62d31aae51083c54d2c53175127d68dbc3b02958016f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1d91fe9523aeadf7c9ef7561d7996607cc58b0a18ab73204343d2a05ae754a1e0b9dd388d2734a8e81a77aa8069c7e07ca9e178060fe73532e550ed430c3068c"; + sha512 = "e32baeabbe7e0b6b02b8b6c7ae1f10921ca05f97b4bab73610ef6164fdefe126651a9bc1e7a00afa42ea5ff163ebe1a4a04394e11e9f5c8a2f78df464180a073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "47efd7f3c63a41b638236bcdf523fa174a5db944f1e7debc68f5e456955d910ab66dfe885a516f707610c6c05c3b126dcbc3f5010688b18f86af90fb92f0e122"; + sha512 = "024f8684b1b87f3c27adab5132cc6371a0e56b405a131b67a025f047b5077fe0c4f41b82b2f88c5583975fd96cd11be4de3befa63c71e1ca209938e1d33d5890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "bf3603ab02401915155dfa32f6aa009777615835e21464ad39a4a7f17bccdfd21a707eb9e8eeb23194df7fa8aaed80071b54b589bb8f8e1617d3520f06bba4db"; + sha512 = "50db5a65147cac7d9805bf90e35d9cec8d5364a1fb97d7ba0e094a8396adca1ebd928469347fe7eef619620e41461f3c115ba3d2687c04c06d990d8d0e5a0f65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "8301ada1fd1ba2ffae4a2edb6882ffdd022f93a0b3e1c8ef739bd7e3053d9530ea177877a7263ae6c21aba8e467746e40318374375423516f206d9f3c953e999"; + sha512 = "0d6fd66316b6df70adfed1f896b7b178832b800ce54db9512a8f344da6095722c29d7cdac29c09c0ae02df6225f8f76442ddbb630a15a6f996023b118f581d59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "58f789dd68b8974c9237dfa4754811dfa4e3fb7ad1f41b0936b19bc990d28b010397b4f6e71fc4b1633080475a71086dde1b9719b07d281b51112672069ca690"; + sha512 = "1e620226f3c81d18013d663dd3f186617222fb75425687b0f07e1bdd35fe42f7889bc826c9e726324cda6045350a24e623a83f637acd2fb4577df68b56b64068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f7fe0f0afc75196e0ffef3110956b8ca3def1949541df36b965b776b95c884622df54db098a1aca3a9fc9818cb5e4af545f749bd8f7a815f8ac4917bda6c0f8b"; + sha512 = "9770c32624919d8fdd215fd8023e5bf80fe15e79e641421a0b16fee9060872a1807364ec400e574eeb59017d43e25cbbaf8bec8574fd473d4c8cc78c596730a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fb4b19d2f48b9977ea8b9e0113be90be339f3eceb167a7c6ed34e6cc47ad8fa74f933ec35f2971c42bd7028810450426aee692dc167f10404935fbadc927d2df"; + sha512 = "f2b45d0195c68091a04cc921070ee31ea410faf2013546800612c9ecda2e999a763f58589d36aa5076cc834d0d31e5d58e3624e24dffa2483d8b889965b9fbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "262f678940aee5583264a1ace147d3a3dab52a4fce1687d6dbac31835701f3f28e7302e89e7dc064276a3fefc348c8136d27ac7649c06d556f71e314c6cb3ee0"; + sha512 = "55be6785f4f76e42e94d263499641c7c883b4217ab0f0846ebdd00019425510a64ed2f16c98b7e3bf86834ac35cca012fa26cbad62ffab8b889f287caaddcfd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01bf9f12281e35432d2c548490b0d45bd94294415453f5f5e5080b734f9804c13fac581786f213d8812c3433b5f085fbd91fa51b8ec5ab2719e1c8c522988355"; + sha512 = "587ce487c9e90a190405ca58efe6537e8138c9726a07d1d4de5911856ab040b7924df5a8474f64a76748f64fc1f35d9fc3018e06977d1047cb7fb55f0bfcec00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ea61f60c91b79e06bf2ce3ff18206ca4410928ddbaf4bcc3e873be60f4b9d35a2a987df852c18eb098d51cf7ad853c19de10398246e40c518de310a22deef4df"; + sha512 = "7ec86498c6e720a77c49a109455df7c9b31b9d1b69cec8a735e605503094b67dc4e38948d6e4e861ba2aa1a8bc680c8619281e5e2ab3545c987ab3099ed211f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "73d96a7957b4a2667c25e9561a499616ef5d87f564fc48e49fcfb59686648438bddbc06bb4b19af879e3ce8607d7742bc0c84b585456044642ba2f42fe1eef5a"; + sha512 = "b1cce9d06ac3eeaed9a92f291c98a2b2011ebbe4afec4fa1afc95c6ead74243078f26f46fd2c07ff62f7b856b7a1c366fd1b302b18c1fa4b5bd1ae8aed49a54a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dc7a015d1a7d63dd31c3c3a1ae2b4aa4a6e63a58a46f9b8bcd33c21e1b80487580ff5499536424af31290f556ddb35b17e161ac956b9c8dc821b998b56edb021"; + sha512 = "70380e961c5f2063024ce0d77571b8bbb8402e991ab8fd69fdf9db749f09d4801f74cd0271e2bcff55dec196ef646d061a633d93f3544faacfb4c045204755bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "94b89adbd22884cd96f21690aaf70d1271df04555218ca3180d3571d546adbe201eecb2f93aa2e0613187c780089a569933c0b0fdab1ef22f4be03fd39e5b868"; + sha512 = "e6d5c3e8dbf60768bc2c4c32b552550ffb954dfc048e393eff1d68d6b246d64e874c42149fcd20d4a706090698ec85c6ddb0da7ff10bff4dac861d31cc5cdea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d4bafc665e1f06daf14f320e24992052f1875ca0267d7bf9915052f202f3e506130a97d82343ed9be784636a9725efd9c5a286d9e91149120f62a01ff86a7057"; + sha512 = "0b5854b257ea50a31ccc9fb5956f45b71aa70e9078771fcb7c005c8cbc6ebdf38c381e6ad7fb75717ba961dafc5639567c2b6a717076f9a97b952b231c1a0b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "43a7e1066df8f854a2af7dea6240ebc14abe09c51bd3ab96f5b2e050f2c138826f302c1592f4e6652e5541380aa3b126f2b70d7cc83abb8215cac6cf2c0f27a2"; + sha512 = "630e53701b5ce7a7bde0090987c5b3aede1725da4dbedde268c1eef7e3250e35e8295376b666a5d099681d601d4a7262e21da30a12553f1e7c90b4971c5ea528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c38b25895cb2486dc5de1d4f759cb3660f81084327ae66166582ca2f39e1783edb1da374162e7b3e28d9519bbaa8995f2864748a3b2170404d47d265f08f38c0"; + sha512 = "c1f0efdf8e94b101975b0a8b15bbd71a02d555bf9c12c0f937045a2e271597aef69e588bf75c714826cc7eef61c43fe046a4016619d4a63d488faffb9bb16f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "968fbafdf4eb8cd71de1cb276f253eb4c6a7078adcb4b5e1af294e764c4fa37a9397023ad35a41cfcf34097fc6fe20d73e664fb2695cd1698e4fdac81a59f9ba"; + sha512 = "cea65de645dba0943c85583e9bb63f923d06f3ac589c812b93eceed995baffb4569f14c45e38c93aa9762929b70087e0dc9a4866ca8d9fffa5ccac8644472cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f49509695435c0ed75bef24640203d9ddbb2ee799c5c47341938dfdaf5238c3d0408dbc00a88c84e38b73d31b955066aceed1545119508ed9d510e5551c3c145"; + sha512 = "90ad8e0c6a4b99ea3751dc0ed4cabc74ec1ec6dd351920f574c1adfacc594fa1a21bc3f7ca77d4abcbc2ab8f8024e3c13a0a9b0fa8629c66c08770ee473ade8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "3b5df92eb3684622a3991878ae0231674dc33947d350b05c978edf4ef3649ef6e69b773cda17e8b5d3cb8f8a604c59c19e6314c889081e5ca98e1bf44fcb1850"; + sha512 = "874dcc2335c3381a8c49ccace54ab7fe0b2c370c1d5e43ff2fb94c93ee74c89de476b810ac71960fc34edbdc735070a140ba3bc919112191b1258810478e8212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3439ef70a3a099be344f71242e2ad45fb89f3cb63ca762a770aa34499b7d0d7dce33546fc987263c309b5c504a04026b2f7ddad327bcf3906b095e965292e6d9"; + sha512 = "61c9843955b6472eaefb13b39cfdcb1371cb249c8cf2e01471b1d27f76273a329c7b578d7ec868822f9ca0ee6818e5fc3210b6d1e4bc625a256316878e6c5baf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e405691dd3fe2ec0e6b54e055da8ca60945068dbc669a95f2baf64348b15ef57785f4add6fcbf4d37aa06f7f618d63db3c794495ff5bcc944def442045188e74"; + sha512 = "8c1ed92350e2dd2aa8051a4491ed064f0c790009d29b2512f1ddb52d8b5e31564dfc8678006c4baf3a4c42ee4d94fb519f4aad59adfe65a5a541e9d4289e4db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3200665e5382d1df831f46ff61b92df6086076bc025b44564169f233a7700ad2ea8f3e1a36c98ce88e2e99860a72d6092c8887180f5d89a1840a3e5a0aab4b2a"; + sha512 = "e11dccf5877b57d996aa75f8bef15a4a914377296f16dba1b59416971f4fd84e4ea43593139e43481351bc038d7a66d53066140fd4436f61d3e0cb1f490a5f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a05c84cbc6ec9afa919a6061fd0cf637ba5337c407ef52bed903f435d2fb7d3e7c3f77298b04bd80f13d0153fc771a1cb3f91a266883e0fa796674880ffcc03f"; + sha512 = "ec297c47b7920cafedb0ffe3cc173a3c2fc986d2f858ee25aa159b8be7f05051cee280590589d7aa712fd3eed376947297ff0afbd64e187f1a19c8bb8a1295a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b71d5784ad5f26cd299141f3192d1cd6d1484caf4c5eb45f90b96237b5dd5d6333076a9817fcc62b44e5e05bcef6340b1f5bdf908582b02a798bdd3988d59370"; + sha512 = "4ca71e223e4c05877bd6cb86f9e3677b60ec22a6b362138818e9fa5f7b2fcc2eb166193e068ca0a6ce3b536ccfd1e6a216505d4ef45b2e90ecc83467e7529443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8db81ab58c019e0abc4a8c3b58c41681a248d64369b9c1a48336e7f04c3bde8af996b30de8cd440e914ac1ea221fbf000df7ec87352e22720cf99883e6d64290"; + sha512 = "69e1296216820c09a299ddab644ace678e7041b86dd2704cf8ac2fd0b548733815e1cf35abf324b0a2614615f96c58073d55074dcb7e66a16c5f7b55f562520d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d2d499aad2075d23c3eca76b4af2c9d25c026deaea5cfed9e8954cd1248a63f051d0a670d043d8dbe4a8dd62b001f460ec7141e4f00769c1dd62239124e777be"; + sha512 = "283dbbc4fb72e0a14889c97e93f48686229d4ca6f2a548ac664dc4fd75bac1f22f5d9f16f6c3bc1a3b83b0c8567cf2856be7fb23e3241a334de80d037b2ef85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5dd6a7e1d3dbdef7c3987744a3dc79dc9beaa2ceb59291160e43b2691151653f98303c2bd7023302fa86986887aacc780e31fb563238e08e748a05939251599c"; + sha512 = "d996775b48dd48ef7c0eaf5387bec85968329acaf6ee4360c5213773dea5a932693a8bbe6b70e2b92d3b387db767bbf8120cbd37257707dad06b9082ddb89032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "43b7e42163f582f496bb1fbedf95d822c3a6d801e3695001e9d9265f73cfd4101d1d20a8ea5e8f2051b3a4633365af393b044559440924f825d4fb7ec8a700df"; + sha512 = "11927162d0d7e3d6dc05be2185a25acd768a99874d9440b4d28b9044c58f19ba6c7a1608bd8a9bea95a5751bfab71a665fa59fc180ca07abd3f86f1c2eeffc8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6d9928ae2f79c3331a7ee308d1b140c9b379de32cf5f3d9eea14e8dd820968264b2e7e90f53fdee0a64fe01fd4d343025a0c83f68def289c53fef97707880e05"; + sha512 = "4ebaef0d862281919e04abecd02173e1eca253944e6a9dab0ff301a0ffa521e93c755d59c819315eaf910d3b75cdd149a01f7302880b44355a0436e27312cdde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d591bd1d9b178f620f8ec139759aa6825bb13483fdd622149f6106deca780f802cf19f016e3ec9fdcc71ada5bd34ef6a8d4a79a26676769cd2b020e0cdfced81"; + sha512 = "01f5e519412f16c4bc21ef86acf287c74f34a51067c7263b5b6e6a9514849167e441dd23ff9f01d9710656189ebe123493f10e5e202d5a690591b84d828ac6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "537ca6ac0cdcffa041e9cfd4817132e5ed6278c21d600d52a0075242ba7681838c7850a795e8953783ddb4c723b1f470ae723c148dbff793b97929c0ffa97175"; + sha512 = "f8199341e89ac1816254fdf0d4b37c1c069c00e193d8c56fc44a6f1e833d174f57b498bd21564989777fe383cb0912800a53dbabe4470402a2ced7cbb8459b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8ec463c0b4dcdc8af09a68b161aa0b44b554e0520d0f59b2ea0b97a0fce0f6fe4084f5d942f51480ff55071f41a06e0e90aba78591ae63b20a255ca51c4c1fd6"; + sha512 = "a3ac61681567f715405b299bf9b772cfea1574b62ea9529e8df6a8155dddd2e26d51419b641c94329d462a21fc3a207dd99ec600b3764d198964f21481cca690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6e48bd9b56110db58b78c7f46009be572ac5d70d6423732f42e583f5bf1f07bac88a63381d800ba419d502d5deda242cd65c2ebb493975f75ad4b73d23d3229b"; + sha512 = "a28730ba99c9f63494b4dc955dcf231e412179a4f1bc405ccaa63325ed34720906c2c6e90e0534544a5328bf51e9b485b91d54e72ce73c873633f1743c1f0734"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "5d38f57f414ffc2497ae08a58ae7458c57f8c346d97e39c6c5f1d6400fe6c2243461a822080932a38873a1f0e497730ef0df74de78017789dca5290e92d2f92f"; + sha512 = "a5ce8085b83ba048211bfb9b2ac173701e0cb1363db8e027430b63f85ef58c845e5775ec1e82417a73531e789059f0cb30583df446fa171fa3df9bedf40cc84d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c8e1ea770afd0e69816d1ca8f9b12b440c99227f2e5c49d6130a8eaef9988fa7735fd05087dc28b428dd977ed6035c96895ce6b9091a08b0a3b2bf0ea38e97fb"; + sha512 = "a4ebe4df7b56338d188aacb98ed58d6eedeffb6bd00b139525bf906e2c3c40316a7e9ab9b1792f02fcc19a7767786ac1f8c0ac8fbb39c7e01868d4406eec7ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "56585f6e9a6581d6ba21e528f8806ae84dc24c0ddddae0137a5563fdcf049cf2250d9fe7996e5ced947c285a5765cf45543bc442cc8e0c7c56e3abac277e7fd7"; + sha512 = "461c94b2a15854e5e3ebb95b2f6fac0a3591fe1b57b2e163e4fe8918ad5736cad1f085bcf0083d2bf2f0cd5cc811c6b7822dc9398adf906496ead870f4b1688a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7db5b6a4d25e30641743cce3cf2eb366c8a6fac93d421d6d14d9e71a1f3a772a737223b8954e2b3c41b7ae20079e2a8d24976c4869ec4d3abf085ab784c9f805"; + sha512 = "1ac1fdc2b3eb80a172efa60aee46e8a3a5bbee3f1bbd62e23bce5503daec25beece76ae22fc78ffe18aeadbb29417453cf3ef19f6462e4f1c3544842e1304d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "860c256a0893ea5f4ef0876997d807afe24d7526dd62811c079b3d2c9678df187ccee3020277c172d50077121e601345d9a654e0f6eb2f28ee8e8dd2c96678e2"; + sha512 = "664b18d6203a7cb1934d2b813b2269cca5eec2e68cfc4a4bbf129107edc2f7a48b6d75cf5cb41abe6387a4c26eedeb53b837ec8aea7eb67f3ee5799ab8a08e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "365d1f7d61441056e3240d30ffa8f507337b44fda9b8a1c04fef5ef32613535e2ef29061a4570c1239fc3dd7183892eb896acd823c5805d77e4167adef077e77"; + sha512 = "241a510e2f520a7afcb84383435587533e62a14b2771cd770763db99a047746aee5249b9272ab34d96160613efb7b3769c8911946a4ffa3f0156570a7a6c4310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5c3e4320848c716e90d1426f76d43a9ba44660eeba55fe6d08d7e1cdc88987f9d2051141c5b3bb45bdd977a8793c9cc1713fa8ae95c23c04cbebab546d9a86d2"; + sha512 = "9621e6f3d49264b07f913b1e8161e0146fea15900dceaa98612b0c32b81059094af5af2321d61300168644421e72486ea6ed9336ac9cbd752e2e192a155e532e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6bd8bc524a9fba341f0be0c5c73897279e4e70713545ddd279c1ea760f87f6a14e8d7ce72486a26bb2e42f6238f4e4806b8fb7b0cff04a89a564c0a6c5188055"; + sha512 = "f26c74a359d71f41bc83320010b356b22a5a8224521c37fb7ecea3d4f79fc4583bcbf6d44d183c04a30b25bac3832635b721c7566052c496f41718f4b7b6694f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "187869732f00a8fa29c3c7ca1437f90ac795a155578a0742a802e6fe3c5a03de54da7d6fa0f4a85bde009bf346e2f505f4485be86bf34dab0b221ed9a6505009"; + sha512 = "106284d66f26ea36e906b24dd204e98a042ef89b749bf059a1d44fc088aee6c08e269257489ca6f215b390606f32af368954bb2507a714f09e3a0fb0a9271900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ba2e4d0e603dcafc3d18881506ea5d7cf9493c116cb5771d2b00b455ee37453dfcba4df30401c390d86377252ba6f961b4ad92c0b777eaef23081443280ce3e8"; + sha512 = "4c90bb8536fce5f052d258f280270e0cf032c257bf7eed70d63f52949f52fcf8a961424372e726cf05026f5a569060e0065231462bcc8626a0f3d166d52434a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "4cbe45129e0b4d7961cdc911dd6e220b5be7a82cfa8b86d688d0c0489c872f50c3fa34f2fc7b6f645a81511a1035ffc9e0bee695d87f512039416b0541698ee9"; + sha512 = "961c106641e47281774c1285bfe8cca3897fe7f3c78d961ac943e35a5d98398124f55d44ea09cef2820e60ddce1f87fa31c498ff005d66603e8d101590c17fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "482feb16a9cf314d4aa6807bc31477e5149a7a769f060e69f9e9a94ef97cc6e951cc585f9fa8bc93b2614f02904791a027de81034174e9a976d33f01bb111462"; + sha512 = "b4cdc14821cc62d09c47026483efd4d2050541e97384d36507eb2d74efb9d98d52ede8c8569365e4b4c49c738ad6e2a6f0252aba6d72abfac90f22a2d8afb8f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "be46161eb9c7cafc89229afcc4242d4780738a040316ee61297bd97b45531fcf84c0df329fbe97bfde4f6b42c63e2715b43a24c93855b1493140fbedf24ab158"; + sha512 = "f2dcdeac743f291b62db80012bad4d5c1233f63579d59d59df85da2584afd1ed50d30f7101748067fd8b59007a5565482b14c3328f1f40066b5098864cc0e99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0be0d3df82ba0623ab20386c52bdfbe95f9348ce9eebc7419ee825e8bbd27dcda3e16d0258fd30deea814c4133130842ec9108ebc3c5d79f2138ec3ce3adfa90"; + sha512 = "c7fe4c6796cb2f05d8ce1af83474cfda7ca6a58e995a6c7908e6bd9dd353fab5235831ccd44d89ad7e8c4bfe2caec9d9d9eca71660d447f0f3d9662b56efc4d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "67f180a71b1cce75d24b9dbf78b914202dcb2e03e7e659e1538b6fe1e3d833ab188dcea70ce5ef99c9fadd7d8ddadab3de808f002005ea2de9038cccfe20e25e"; + sha512 = "a2e0792cb72b5c69030732707008347d04cfb455f2df45e25b10f0e78d3fb94d4a5c5a4b2d92ec7566501c60c3ae952438b0285af588daa1f7e6e0a4ada269c2"; } ]; } From 5fb1cfb77bf5330d33ad5ccf232c2fdd1cf4eaf7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 1 Jun 2018 14:38:54 +0800 Subject: [PATCH 134/153] nodePackages_8_x.pnpm: wrap nodejs.passthru.python --- pkgs/development/node-packages/default-v8.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 701648da2280..0428095d97c6 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -24,13 +24,13 @@ nodePackages // { phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - + webdrvr = nodePackages.webdrvr.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - + preRebuild = '' mkdir $TMPDIR/webdrvr - + ln -s ${pkgs.fetchurl { url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; @@ -66,6 +66,15 @@ nodePackages // { ''; }); + pnpm = nodePackages.pnpm.override (oldAttrs: { + nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]} + done + ''; + }); + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore From 26a01ede6102752bc947b1c4fb2cb957c7b130d8 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Fri, 1 Jun 2018 03:12:25 -0400 Subject: [PATCH 135/153] perlPackages.Git: init at 0.42 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b89b8403dd22..d4a3ee1234e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6549,6 +6549,20 @@ let self = _self // overrides; _self = with self; { }; }; + Git = buildPerlPackage rec { + name = "Git-0.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSOUTH/${name}.tar.gz"; + sha256 = "9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d"; + }; + propagatedBuildInputs = [ Error ]; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git"; + license = stdenv.lib.licenses.free; + }; + }; + GitPurePerl = buildPerlPackage rec { name = "Git-PurePerl-0.53"; src = fetchurl { From 82d837cde2f438eb6ba1c3f5ae1fc8f78152b8c1 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 1 Jun 2018 13:13:52 +0300 Subject: [PATCH 136/153] bat: 0.3.0 -> 0.4.1 (#41348) --- pkgs/tools/misc/bat/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b869f1e634c5..7a3231ce85c2 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,19 +1,19 @@ -{ stdenv, pkgs, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp"; + sha256 = "0fiif6b8g2hdb05s028dbcpav6ax0qap2hbsr9p2bld4z7j7321m"; }; - cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3"; + cargoSha256 = "0w0y3sfrpk8sn9rls90kjqrqr62pd690ripdfbvb5ipkzizp429l"; - buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ]; + nativeBuildInputs = [ cmake pkgconfig zlib ]; meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; From 23e9126e755c221bb8bed69730e259fb20ec44bf Mon Sep 17 00:00:00 2001 From: patternspandemic Date: Fri, 1 Jun 2018 03:17:03 -0700 Subject: [PATCH 137/153] neo4j: 3.3.4 -> 3.4.0 (#41338) --- pkgs/servers/nosql/neo4j/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index bc67e7eaf430..022a1a9ba10f 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { - url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc"; + url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; + sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From 86990d26bad0d1ffafc7295eec595dd0325576e9 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 1 Jun 2018 18:23:01 +0800 Subject: [PATCH 138/153] scite: 3.7.5 -> 4.0.5 (#41345) --- pkgs/applications/editors/scite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 61b28e02949e..76a00c44ebbe 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scite-${version}"; - version = "3.7.5"; + version = "4.0.5"; src = fetchurl { - url = http://www.scintilla.org/scite375.tgz; - sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji"; + url = http://www.scintilla.org/scite405.tgz; + sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; nativeBuildInputs = [ pkgconfig ]; From 85952d850e40d40f801d6653db24448fb375d8e3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 21 Apr 2018 18:30:12 +0300 Subject: [PATCH 139/153] raspberrypifw: 1.20180328 -> 1.20180417 --- 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 d00f1b148374..344d224df948 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.20180328"; + version = "1.20180417"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21"; + sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji"; }; installPhase = '' From b71f5830fa5a56251ca675a26e7066ec5d0a88a7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 3 Apr 2018 02:20:05 +0300 Subject: [PATCH 140/153] linux_rpi: 1.20171029 -> 1.20180417 --- 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 d85583242213..d6b174a43d4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.59"; - tag = "1.20171029"; + modDirVersion = "4.14.34"; + tag = "1.20180417"; in stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; + sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2"; }; defconfig = { From 964bd06bbc35bb26d9b0166d085f43cc9e8e53f0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 20 Apr 2018 14:58:32 +0300 Subject: [PATCH 141/153] U-Boot: 2018.03 -> 2018.05 --- pkgs/misc/uboot/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 4cf1748bad44..d9cc1c077d36 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -7,8 +7,8 @@ let # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05 sunxiPatch = fetchpatch { name = "sunxi.patch"; - url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch"; - sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq"; + url = "https://github.com/u-boot/u-boot/compare/v2018.05...dezgeg:2018-05-sunxi.patch"; + sha256 = "1dfv4s1f71iv80vjxgyghv4pcwjv4mjphk75a8hfl3jdbpd66d36"; }; buildUBoot = { filesToInstall @@ -21,21 +21,21 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2018.03"; + version = "2018.05"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y"; + sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad"; }; patches = [ (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch; - sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9"; + url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch; + sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p"; }) (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch2.patch; - sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4"; + url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch2.patch; + sha256 = "0q1a5l5rfgddncxrjk59qr1f5587dwbvcf6z15bsfl2invs19m2b"; }) (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch; @@ -100,8 +100,7 @@ in rec { hardeningDisable = []; dontStrip = false; extraMeta.platforms = stdenv.lib.platforms.linux; - # build tools/kwboot - extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; + extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; postConfigure = '' sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config ''; From 912e87c45cc4ffbdb80a606d01fe2fa6545386a3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 5 May 2018 14:44:04 +0300 Subject: [PATCH 142/153] U-Boot: Add ubootRaspberryPiZero variant --- pkgs/misc/uboot/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index d9cc1c077d36..9486a504ac39 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -217,6 +217,12 @@ in rec { filesToInstall = ["u-boot.bin"]; }; + ubootRaspberryPiZero = buildUBoot rec { + defconfig = "rpi_0_w_defconfig"; + extraMeta.platforms = ["armv6l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootSheevaplug = buildUBoot rec { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c8acb7cff0e..b7bb3ab70e66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14206,6 +14206,7 @@ with pkgs; ubootRaspberryPi2 ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit + ubootRaspberryPiZero ubootSheevaplug ubootSopine ubootUtilite From f49906d80c30dbb37a2d2d188ab9bd9793a4ac3f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 5 May 2018 19:02:00 +0300 Subject: [PATCH 143/153] nixos/sd-image-raspberrypi: Support Raspberry Pi Zero --- .../installer/cd-dvd/sd-image-raspberrypi.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 212013b5e289..fe6cc4161630 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -31,11 +31,24 @@ in users.extraUsers.root.initialHashedPassword = ""; sdImage = { - populateBootCommands = '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) - cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin - echo 'kernel u-boot-rpi.bin' > boot/config.txt - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot - ''; + populateBootCommands = let + configTxt = pkgs.writeText "config.txt" '' + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + + [pi0] + kernel=u-boot-rpi0.bin + + [pi1] + kernel=u-boot-rpi1.bin + ''; + in '' + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) + cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin boot/u-boot-rpi0.bin + cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi1.bin + cp ${configTxt} boot/config.txt + ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot + ''; }; } From a8c898be6071c461961b4572afe3b72b7c831fc7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 7 May 2018 21:59:15 +0300 Subject: [PATCH 144/153] linux_rpi: More downstream device tree name fixups Also remove the upstream device trees beforehand so we don't accidentally end using them if we mess up in postFixup. Also on the topic of mess ups, make the copy unconditional since they always seem to be built on all architectures anyway so checking for their existence just hides typos. --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d6b174a43d4e..d869ea090360 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -32,16 +32,15 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { ''; postFixup = '' - # Make copies of the DTBs so that U-Boot finds them, as it is looking for the upstream names. - # This is ugly as heck. + # Make copies of the DTBs named after the upstream names so that U-Boot finds them. + # This is ugly as heck, but I don't know a better solution so far. + rm $out/dtbs/bcm283*.dtb copyDTB() { - if [ -f "$out/dtbs/$1" ]; then - cp -v "$out/dtbs/$1" "$out/dtbs/$2" - fi + cp -v "$out/dtbs/$1" "$out/dtbs/$2" } - # I am not sure if all of these are correct... - copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb @@ -51,6 +50,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb - # bcm2710-rpi-cm3.dts is yet unknown. + copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb + copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb ''; }) From 5d795355a0eba0c2cc0a8ccf0d204a3d631637ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jun 2018 14:22:07 +0200 Subject: [PATCH 145/153] signal-desktop: Fix a possible crash when saving an attachment If executed in a pure environment (nix-shell --pure) or depending on the `gtk3` version of the system Signal-Desktop was e.g. crashing when clicking on a PDF attachment (instead of showing the dialog to save a file). Using wrapGAppsHook and setting XDG_DATA_DIRS to the correct version fixes this bug. The error message was the following: ``` (signal-desktop:30756): Gtk-WARNING **: 14:04:49.073: Could not find the icon 'user-home-symbolic-ltr'. The 'hicolor' theme was not found either, perhaps you need to install it. You can get a copy from: http://icon-theme.freedesktop.org/releases (signal-desktop:30756): GLib-GIO-ERROR **: 14:04:49.134: No GSettings schemas are installed on the system Trace/breakpoint trap ``` --- .../instant-messengers/signal-desktop/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index da862b715147..fa31b19e6e2c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, +{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev @@ -52,7 +52,7 @@ in throw "Signal for Desktop is not currently supported on ${stdenv.system}"; phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; unpackPhase = "dpkg-deb -x $src ."; installPhase = '' mkdir -p $out @@ -67,6 +67,9 @@ in # Patch signal patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + wrapProgram $out/libexec/signal-desktop \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + "''${gappsWrapperArgs[@]}" # Symlink to bin mkdir -p $out/bin From 548277d0c7bfa5863c1424e7b603b25093c5bc33 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 24 Feb 2018 18:41:07 +0100 Subject: [PATCH 146/153] bulletml: init at 0.0.6 --- .../libraries/bulletml/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/libraries/bulletml/default.nix diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix new file mode 100644 index 000000000000..240cc057a821 --- /dev/null +++ b/pkgs/development/libraries/bulletml/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchpatch, fetchurl, bison, perl }: + +let + version = "0.0.6"; + debianRevision = "7"; + debianPatch = patchname: hash: fetchpatch { + name = "${patchname}.patch"; + url = "https://sources.debian.org/data/main/b/bulletml/${version}-${debianRevision}/debian/patches/${patchname}.patch"; + sha256 = hash; + }; + +in stdenv.mkDerivation { + name = "bulletml-${version}"; + + srcs = [ + (fetchurl { + url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2"; + sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw"; + }) + (fetchurl { + url = "http://shinh.skr.jp/d/d_cpp.tar.bz2"; + sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh"; + }) + ]; + sourceRoot = "bulletml"; + postUnpack = "mv d_cpp bulletml/"; + + patches = [ + (debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl") + (debianPatch "bulletml_d" "03d1dgln3gkiw019pxn3gwgjkmvzisq8kp3n6fpn38yfwh4fp4hv") + (debianPatch "d_cpp" "04g9c7c89w7cgrxw75mcbdhzxqmz1716li49mhl98znakchrlb9h") + (debianPatch "warnings" "18px79x4drvm6dy6w6js53nzlyvha7qaxhz5a99b97pyk3qc7i9g") + (debianPatch "makefile" "0z6yxanxmarx0s08gh12pk2wfqjk8g797wmfcqczdv1i6xc7nqzp") + (debianPatch "includes" "1n11j5695hs9pspslf748w2cq5d78s6bwhyl476wp6gcq6jw20bw") + ]; + + makeFlags = [ + "-C src" + ]; + nativeBuildInputs = [ bison perl ]; + + installPhase = '' + install -D -m 644 src/bulletml.d "$out"/include/d/bulletml.d + install -d "$out"/include/bulletml/tinyxml + install -m 644 src/*.h "$out"/include/bulletml + install -m 644 src/tinyxml/tinyxml.h "$out"/include/bulletml/tinyxml + cp -r src/boost $out/include/boost + + install -d "$out"/lib + install -m 644 src/libbulletml.{a,so}* "$out"/lib + + install -D -m 644 README "$out"/share/doc/libbulletml/README.jp + install -m 644 README.en "$out"/share/doc/libbulletml + install -m 644 README.bulletml "$out"/share/doc/libbulletml + install -D -m 644 README "$out"/share/licenses/libbulletml/README.jp + install -m 644 README.en "$out"/share/licenses/libbulletml + ''; + + meta = with stdenv.lib; { + description = "C++ library to handle BulletML easily"; + longDescription = '' + BulletML is the Bullet Markup Language. BulletML can describe the barrage + of bullets in shooting games. + ''; + homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + # See https://github.com/NixOS/nixpkgs/pull/35482 + # for some attempts in getting it to build on darwin + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a43f084b56a7..079219f7bb4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8636,6 +8636,8 @@ with pkgs; buddy = callPackage ../development/libraries/buddy { }; + bulletml = callPackage ../development/libraries/bulletml { }; + bwidget = callPackage ../development/libraries/bwidget { }; bzrtp = callPackage ../development/libraries/bzrtp { }; From f78f2e10177d1dc929c7be9eb85dd07de9678a41 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 24 Feb 2018 18:41:33 +0100 Subject: [PATCH 147/153] rrootage: init at 0.23a --- pkgs/games/rrootage/default.nix | 80 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/games/rrootage/default.nix diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix new file mode 100644 index 000000000000..8b07a38c7bb7 --- /dev/null +++ b/pkgs/games/rrootage/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchpatch, fetchurl, SDL, SDL_mixer, bulletml }: + +let + version = "0.23a"; + debianRevision = "12"; + debianPatch = patchname: hash: fetchpatch { + name = "${patchname}.patch"; + url = "https://sources.debian.org/data/main/r/rrootage/${version}-${debianRevision}/debian/patches/${patchname}.patch"; + sha256 = hash; + }; + +in stdenv.mkDerivation { + name = "rrootage-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz"; + sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln"; + }; + + patches = [ + (debianPatch + "01_makefile" + "0wgplznx9kgb82skwqplpydbpallgrby3w662h52wky5zl0pyijj") + (debianPatch + "02_data_dir" + "12vw60s94by3f6k8pk45k555h4y7gzlqfds0a96nrrryammpgnq3") + (debianPatch + "03_texture_filename" + "1qxkxy6821xvanacf25mi43wj8nf40c1qiyavhc8av798xprpkjh") + (debianPatch + "04_home" + "0s15b0liv40jzjd9l4zsq688ky1yp9b1gmb1xhi3bih4y7q9awdz") + (debianPatch + "05_gcc" + "06ihgbfrklabs7cb6216w1jjb9sglv86iagzhhmyydwyph4fb782") + (debianPatch + "06_rrootage_highres" + "0ifjmh236yiv3g896nfwwydgcnq3njdb8ldah7s3jxp3xkpvwcga") + (debianPatch + "07_use_system_bulletml" + "1sxsl1yzx3msvz8mf0jk1vnahqb1ahq9drm391idgh0afy77l6j7") + (debianPatch + "08_windowed_mode" + "0knx4g445ngilsz4dvdkq69f5f8i2xv2fnmdmq037xd5rhfg0b23") + (debianPatch + "09_rootage_make_highres_default" + "1zqz8s54rl8jmqmvdi9c3ayfcma6qkbfkx5vw0fzyn268wcs022p") + (debianPatch + "10_deg_out_of_range" + "1wr76az4rlv1gaj9xdknzqcjazw6h8myqw6y3753q259hxbq4cah") + ]; + postPatch = '' + substituteInPlace "src/screen.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage" + substituteInPlace "src/soundmanager.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage" + substituteInPlace "src/barragemanager.cc" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage" + ''; + + buildInputs = [ SDL SDL_mixer bulletml ]; + makeFlags = [ "-C src" "-f makefile.lin" ]; + hardeningDisable = [ "stackprotector" "fortify" ]; # buffer overflow without this + + installPhase = '' + install -d "$out"/share/games + cp -r rr_share "$out"/share/games/rrootage + install -D src/rrootage "$out"/bin/rrootage + + install -D -m 644 readme.txt "$out"/share/licenses/rrootage/README.jp + install -m 644 readme_e.txt "$out"/share/licenses/rrootage/README.en + + install -D -m 644 readme.txt "$out"/share/doc/rrootage/README.jp + install -m 644 readme_e.txt "$out"/share/doc/rrootage/README.en + install -m 644 readme_linux "$out"/share/doc/rrootage/README + ''; + + meta = with stdenv.lib; { + description = "Abstract shooter created by Kenta Cho"; + homepage = "http://rrootage.sourceforge.net/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 079219f7bb4c..185a7a3125f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19419,6 +19419,8 @@ with pkgs; rocksndiamonds = callPackage ../games/rocksndiamonds { }; + rrootage = callPackage ../games/rrootage { }; + saga = callPackage ../applications/gis/saga { }; samplv1 = callPackage ../applications/audio/samplv1 { }; From ab593d46dc38b9f0f23964120912138c77fa9af4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jun 2018 14:53:30 +0200 Subject: [PATCH 148/153] signal-desktop: Refactor the package description Removed some redundancy (src check via meta.platforms) and made some changes according to our style-guide. I've changed meta.description and added meta.longDescription. --- .../signal-desktop/default.nix | 99 ++++++++++--------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fa31b19e6e2c..60c075c2fadb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,10 @@ -{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev +{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook +, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, cups, expat, udev }: + let rpath = lib.makeLibraryPath [ alsaLib @@ -36,57 +38,56 @@ let xorg.libxcb ]; -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; +in stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + version = "1.12.0"; - version = "1.12.0"; + src = fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk"; + }; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + phases = [ "unpackPhase" "installPhase" ]; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out + nativeBuildInputs = [ dpkg wrapGAppsHook ]; - mv ./usr/share $out/share - mv $out/opt/Signal $out/libexec - rmdir $out/opt + unpackPhase = "dpkg-deb -x $src ."; - chmod -R g-w $out + installPhase = '' + mkdir -p $out + cp -R opt $out - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop - wrapProgram $out/libexec/signal-desktop \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - "''${gappsWrapperArgs[@]}" + mv ./usr/share $out/share + mv $out/opt/Signal $out/libexec + rmdir $out/opt - # Symlink to bin - mkdir -p $out/bin - ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + chmod -R g-w $out - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + wrapProgram $out/libexec/signal-desktop \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + "''${gappsWrapperArgs[@]}" + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + ''; + + meta = { + description = "Private, simple, and secure messenger"; + longDescription = '' + Signal Desktop is an Electron application that links with your + "Signal Android" or "Signal iOS" app. ''; - - meta = { - description = "Signal Private Messenger for the Desktop."; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus primeos ]; - platforms = [ - "x86_64-linux" - ]; - }; - } + homepage = https://signal.org/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ixmatus primeos ]; + platforms = [ "x86_64-linux" ]; + }; +} From c69cc21338d476358af7c794fcdad18f678785eb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jun 2018 15:06:06 +0200 Subject: [PATCH 149/153] tdesktopPackages.preview: 1.2.24 -> 1.3.0 Note: I'm not packaging this as stable for now as there might be some issues left (see GitHub), it says "Version 1.3 alpha" in the bottom left corner, and I've only got a "New in version 1.2.25" message. --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 12b6179f8e1a..50a0d6db2273 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.2.24"; - sha256Hash = "0rrji2h2a7fxdl4wmbwj053vwy3hhbaphymjim55klpzj86jycil"; + version = "1.3.0"; + sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i"; }); } From 6c76c4c6d8cfb4575d913367a2088d643914c726 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 1 Jun 2018 18:25:08 +0200 Subject: [PATCH 150/153] prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363) --- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 9fd7ae8591fc..9692354ad8a8 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "snmp_exporter-${version}"; - version = "0.9.0"; + version = "0.11.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "081ah4zyy53plhm6znwrx55phm2ysxzyx7d4hm8zzrv5r967rgl1"; + sha256 = "027p96jzhq9l7m3s5qxxg3rqp14pai7q66d3ppin19lg7al11c9x"; }; buildInputs = [ net_snmp ]; From a0797bad2c9ea3781367703bb603ab21e5d64d3e Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 1 Jun 2018 13:37:43 +0200 Subject: [PATCH 151/153] nixos/mpd: allow services.mpd.dbFile to be null This change allows users to specify an alternative database method. For example an mpd satellite setup where another mpd on the network shares it's database with the local instance. The `dbFile` parameter must not be configured in that case. --- nixos/modules/services/audio/mpd.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 5f379b392ea8..500a9e35a13b 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -13,7 +13,9 @@ let mpdConf = pkgs.writeText "mpd.conf" '' music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.playlistDirectory}" - db_file "${cfg.dbFile}" + ${lib.optionalString (cfg.dbFile != null) '' + db_file "${cfg.dbFile}" + ''} state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" @@ -126,11 +128,12 @@ in { }; dbFile = mkOption { - type = types.str; + type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; defaultText = ''''${dataDir}/tag_cache''; description = '' - The path to MPD's database. + The path to MPD's database. If set to null the + paramter is omitted from the configuration. ''; }; }; From 19fa9b2e309877734bb47ff3150e504dbba9d417 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Fri, 1 Jun 2018 19:19:09 +0200 Subject: [PATCH 152/153] haskell.packages.ghcjs.terminfo: Bump version (#41337) --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7a6416b9e13b..c04686734675 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -50,7 +50,7 @@ self: super: haskeline = self.haskeline_0_7_3_1; hoopl = self.hoopl_3_10_2_1; hpc = self.hpc_0_6_0_2; - terminfo = self.terminfo_0_4_0_2; + terminfo = self.terminfo_0_4_1_1; xhtml = self.xhtml_3000_2_1; ## OTHER PACKAGES From 44659fcbe162b8dbce50df6fc32ca63637e2f9ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Jun 2018 19:31:02 +0200 Subject: [PATCH 153/153] coqPackages.contribs.aac-tactics: enable for Coq 8.7 and 8.8 (#41351) --- .../coq-modules/contribs/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 7b274812737e..1b310d74b82a 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -21,11 +21,18 @@ let mkContrib = repo: revs: param: }; }; in { - aac-tactics = mkContrib "aac-tactics" [ ] { - version = "v8.6.0-7-g54913f4"; - rev = "54913f44939623986ce3e01e3faf31efa9059ca6"; - sha256 = "0bb6y7nqs4gyv1ybzhbdg6hb2hyfxc7bmkg6zl43l14641zhv247"; - }; + aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { + "8.7" = { + version = "20180530"; + rev = "f01df35e1d796ce1fdc7ba3d670ce5d63c95d544"; + sha256 = "1bwvnbd5ws1plgj147blcrvyycf3gg3fz3rm2mckln8z3sfxyq2k"; + }; + "8.8" = { + version = "20180530"; + rev = "86ac28259030649ef51460e4de2441c8a1017751"; + sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9"; + }; + }."${coq.coq-version}"; abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] { version = "v8.6.0";