diff options
1514 files changed, 11205 insertions, 5094 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a1cf6e4ee86..24983cb52878 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -50,3 +50,6 @@ pkgs/development/tools/erlang/* @gleber # Jetbrains pkgs/applications/editors/jetbrains @edwtjo + +# Eclipse +pkgs/applications/editors/eclipse @rycee diff --git a/README.md b/README.md index 1a0fb5014ded..b3d5347a6f60 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest +custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-17.03 +% git rebase channels/nixos-17.09 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03) +* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents) +* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) Communication: diff --git a/doc/stdenv.xml b/doc/stdenv.xml index dac53bc2b800..a097762130a5 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,4 +1,3 @@ - <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-stdenv"> @@ -188,11 +187,13 @@ genericBuild <varlistentry> <term><varname>NIX_DEBUG</varname></term> - <listitem><para>If set, <literal>stdenv</literal> will print some - debug information during the build. In particular, the - <command>gcc</command> and <command>ld</command> wrapper scripts - will print out the complete command line passed to the wrapped - tools.</para></listitem> + <listitem><para> + A natural number indicating how much information to log. + If set to 1 or higher, <literal>stdenv</literal> will print moderate debug information during the build. + In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools. + If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing. + If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing. + </para></listitem> </varlistentry> </variablelist> diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ec61151a4fc4..cf1c97865345 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -41,6 +41,7 @@ amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>"; anderspapitto = "Anders Papitto <anderspapitto@gmail.com>"; + andir = "Andreas Rammhold <andreas@rammhold.de>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; @@ -98,6 +99,7 @@ canndrew = "Andrew Cann <shum@canndrew.org>"; carlsverre = "Carl Sverre <accounts@carlsverre.com>"; casey = "Casey Rodarmor <casey@rodarmor.net>"; + catern = "Spencer Baugh <sbaugh@catern.com>"; caugner = "Claas Augner <nixos@caugner.de>"; cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>"; cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>"; @@ -136,6 +138,7 @@ dancek = "Hannu Hartikainen <hannu.hartikainen@gmail.com>"; danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>"; dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>"; + david50407 = "David Kuo <me@davy.tw>"; davidak = "David Kleuker <post@davidak.de>"; davidrusu = "David Rusu <davidrusu.me@gmail.com>"; davorb = "Davor Babic <davor@davor.se>"; @@ -163,13 +166,14 @@ dotlambda = "Robert Schütz <rschuetz17@gmail.com>"; doublec = "Chris Double <chris.double@double.co.nz>"; dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>"; + dpflug = "David Pflug <david@pflug.email>"; drets = "Dmytro Rets <dmitryrets@gmail.com>"; drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>"; dtzWill = "Will Dietz <nix@wdtz.org>"; dywedir = "Vladyslav M. <dywedir@protonmail.ch>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; - ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; + ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>"; edanaher = "Evan Danaher <nixos@edanaher.net>"; edef = "edef <edef@edef.eu>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; @@ -287,6 +291,7 @@ joelmo = "Joel Moberg <joel.moberg@gmail.com>"; joelteon = "Joel Taylor <me@joelt.io>"; johbo = "Johannes Bornhold <johannes@bornhold.name>"; + johnmh = "John M. Harris, Jr. <johnmh@openblox.org>"; johnramsden = "John Ramsden <johnramsden@riseup.net>"; joko = "Ioannis Koutras <ioannis.koutras@gmail.com>"; jonafato = "Jon Banafato <jon@jonafato.com>"; @@ -383,7 +388,6 @@ mikefaille = "Michaël Faille <michael@faille.io>"; miltador = "Vasiliy Solovey <miltador@yandex.ua>"; mimadrid = "Miguel Madrid <mimadrid@ucm.es>"; - mingchuan = "Ming Chuan <ming@culpring.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>"; mjanczyk = "Marcin Janczyk <m@dragonvr.pl>"; @@ -457,6 +461,7 @@ periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>"; peterhoeg = "Peter Hoeg <peter@hoeg.com>"; + peterromfeldhk = "Peter Romfeld <peter.romfeld.hk@gmail.com>"; peti = "Peter Simons <simons@cryp.to>"; philandstuff = "Philip Potter <philip.g.potter@gmail.com>"; phile314 = "Philipp Hausmann <nix@314.ch>"; @@ -549,8 +554,10 @@ shell = "Shell Turner <cam.turn@gmail.com>"; shlevy = "Shea Levy <shea@shealevy.com>"; siddharthist = "Langston Barrett <langston.barrett@gmail.com>"; + sifmelcara = "Ming Chuan <ming@culpring.com>"; sigma = "Yann Hodique <yann.hodique@gmail.com>"; simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>"; + sivteck = "Sivaram Balakrishnan <sivaram1992@gmail.com>"; sjagoe = "Simon Jagoe <simon@simonjagoe.com>"; sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>"; sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>"; @@ -572,6 +579,7 @@ sternenseemann = "Lukas Epple <post@lukasepple.de>"; stesie = "Stefan Siegl <stesie@brokenpipe.de>"; steveej = "Stefan Junker <mail@stefanjunker.de>"; + stumoss = "Stuart Moss <samoss@gmail.com>"; SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>"; swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>"; swflint = "Samuel W. Flint <swflint@flintfam.org>"; @@ -586,6 +594,7 @@ taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>"; tari = "Peter Marheine <peter@taricorp.net>"; tavyc = "Octavian Cerna <octavian.cerna@gmail.com>"; + TealG = "Teal Gaure <~@Teal.Gr>"; teh = "Tom Hunger <tehunger@gmail.com>"; telotortium = "Robert Irelan <rirelan@gmail.com>"; teto = "Matthieu Coudron <mcoudron@hotmail.com>"; diff --git a/lib/types.nix b/lib/types.nix index 62c6a978af90..c48e3b3000ce 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -240,25 +240,6 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - # List or element of ... - loeOf = elemType: mkOptionType rec { - name = "loeOf"; - description = "element or list of ${elemType.description}s"; - check = x: isList x || elemType.check x; - merge = loc: defs: - let - defs' = filterOverrides defs; - res = (head defs').value; - in - if isList res then concatLists (getValues defs') - else if lessThan 1 (length defs') then - throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." - else if !isString res then - throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." - else res; - functor = (defaultFunctor name) // { wrapped = elemType; }; - }; - # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { name = "uniq"; diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 5233e0624450..ddc3c7c4a967 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -49,8 +49,8 @@ def get_maintainers(attr_name): @click.command() @click.option( '--jobset', - default="nixos/release-17.03", - help='Hydra project like nixos/release-17.03') + default="nixos/release-17.09", + help='Hydra project like nixos/release-17.09') def cli(jobset): """ Given a Hydra project, inspect latest evaluation diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 4e4b0178a088..66f7b01db72a 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -534,7 +534,7 @@ FLUSH PRIVILEGES; Nixpkgs overlays may now be specified with a file as well as a directory. The value of <literal><nixpkgs-overlays></literal> may be a file, and <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the - <filename>~/.config/nixpkgs/overalys</filename> directory. + <filename>~/.config/nixpkgs/overlays</filename> directory. </para> <para> See the overlays chapter of the Nixpkgs manual for more details. diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 830e7cdd2696..47522fe3cc92 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -71,6 +71,8 @@ following incompatible changes:</para> <itemizedlist> <listitem> <para> + ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>. + That means that old configuration is not overwritten by default when update to the znc options are made. </para> </listitem> </itemizedlist> diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix deleted file mode 100644 index d318b7207429..000000000000 --- a/nixos/modules/config/krb5.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.krb5; - -in - -{ - ###### interface - - options = { - - krb5 = { - - enable = mkOption { - default = false; - description = "Whether to enable Kerberos V."; - }; - - defaultRealm = mkOption { - default = "ATENA.MIT.EDU"; - description = "Default realm."; - }; - - domainRealm = mkOption { - default = "atena.mit.edu"; - description = "Default domain realm."; - }; - - kdc = mkOption { - default = "kerberos.mit.edu"; - description = "Key Distribution Center"; - }; - - kerberosAdminServer = mkOption { - default = "kerberos.mit.edu"; - description = "Kerberos Admin Server."; - }; - - }; - - }; - - ###### implementation - - config = mkIf config.krb5.enable { - - environment.systemPackages = [ pkgs.krb5Full ]; - - environment.etc."krb5.conf".text = - '' - [libdefaults] - default_realm = ${cfg.defaultRealm} - encrypt = true - - # The following krb5.conf variables are only for MIT Kerberos. - krb4_config = /etc/krb.conf - krb4_realms = /etc/krb.realms - kdc_timesync = 1 - ccache_type = 4 - forwardable = true - proxiable = true - - # The following encryption type specification will be used by MIT Kerberos - # if uncommented. In general, the defaults in the MIT Kerberos code are - # correct and overriding these specifications only serves to disable new - # encryption types as they are added, creating interoperability problems. - - # default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - # default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - # permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5 - - # The following libdefaults parameters are only for Heimdal Kerberos. - v4_instance_resolve = false - v4_name_convert = { - host = { - rcmd = host - ftp = ftp - } - plain = { - something = something-else - } - } - fcc-mit-ticketflags = true - - [realms] - ${cfg.defaultRealm} = { - kdc = ${cfg.kdc} - admin_server = ${cfg.kerberosAdminServer} - #kpasswd_server = ${cfg.kerberosAdminServer} - } - ATHENA.MIT.EDU = { - kdc = kerberos.mit.edu:88 - kdc = kerberos-1.mit.edu:88 - kdc = kerberos-2.mit.edu:88 - admin_server = kerberos.mit.edu - default_domain = mit.edu - } - MEDIA-LAB.MIT.EDU = { - kdc = kerberos.media.mit.edu - admin_server = kerberos.media.mit.edu - } - ZONE.MIT.EDU = { - kdc = casio.mit.edu - kdc = seiko.mit.edu - admin_server = casio.mit.edu - } - MOOF.MIT.EDU = { - kdc = three-headed-dogcow.mit.edu:88 - kdc = three-headed-dogcow-1.mit.edu:88 - admin_server = three-headed-dogcow.mit.edu - } - CSAIL.MIT.EDU = { - kdc = kerberos-1.csail.mit.edu - kdc = kerberos-2.csail.mit.edu - admin_server = kerberos.csail.mit.edu - default_domain = csail.mit.edu - krb524_server = krb524.csail.mit.edu - } - IHTFP.ORG = { - kdc = kerberos.ihtfp.org - admin_server = kerberos.ihtfp.org - } - GNU.ORG = { - kdc = kerberos.gnu.org - kdc = kerberos-2.gnu.org - kdc = kerberos-3.gnu.org - admin_server = kerberos.gnu.org - } - 1TS.ORG = { - kdc = kerberos.1ts.org - admin_server = kerberos.1ts.org - } - GRATUITOUS.ORG = { - kdc = kerberos.gratuitous.org - admin_server = kerberos.gratuitous.org - } - DOOMCOM.ORG = { - kdc = kerberos.doomcom.org - admin_server = kerberos.doomcom.org - } - ANDREW.CMU.EDU = { - kdc = vice28.fs.andrew.cmu.edu - kdc = vice2.fs.andrew.cmu.edu - kdc = vice11.fs.andrew.cmu.edu - kdc = vice12.fs.andrew.cmu.edu - admin_server = vice28.fs.andrew.cmu.edu - default_domain = andrew.cmu.edu - } - CS.CMU.EDU = { - kdc = kerberos.cs.cmu.edu - kdc = kerberos-2.srv.cs.cmu.edu - admin_server = kerberos.cs.cmu.edu - } - DEMENTIA.ORG = { - kdc = kerberos.dementia.org - kdc = kerberos2.dementia.org - admin_server = kerberos.dementia.org - } - stanford.edu = { - kdc = krb5auth1.stanford.edu - kdc = krb5auth2.stanford.edu - kdc = krb5auth3.stanford.edu - admin_server = krb5-admin.stanford.edu - default_domain = stanford.edu - } - - [domain_realm] - .${cfg.domainRealm} = ${cfg.defaultRealm} - ${cfg.domainRealm} = ${cfg.defaultRealm} - .mit.edu = ATHENA.MIT.EDU - mit.edu = ATHENA.MIT.EDU - .exchange.mit.edu = EXCHANGE.MIT.EDU - exchange.mit.edu = EXCHANGE.MIT.EDU - .media.mit.edu = MEDIA-LAB.MIT.EDU - media.mit.edu = MEDIA-LAB.MIT.EDU - .csail.mit.edu = CSAIL.MIT.EDU - csail.mit.edu = CSAIL.MIT.EDU - .whoi.edu = ATHENA.MIT.EDU - whoi.edu = ATHENA.MIT.EDU - .stanford.edu = stanford.edu - - [logging] - kdc = SYSLOG:INFO:DAEMON - admin_server = SYSLOG:INFO:DAEMON - default = SYSLOG:INFO:DAEMON - krb4_convert = true - krb4_get_tickets = false - - [appdefaults] - pam = { - debug = false - ticket_lifetime = 36000 - renew_lifetime = 36000 - max_timeout = 30 - timeout_shift = 2 - initial_timeout = 1 - } - ''; - - }; - -} diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix new file mode 100644 index 000000000000..c22e99a0a2f1 --- /dev/null +++ b/nixos/modules/config/krb5/default.nix @@ -0,0 +1,367 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.krb5; + + # This is to provide support for old configuration options (as much as is + # reasonable). This can be removed after 18.03 was released. + defaultConfig = { + libdefaults = optionalAttrs (cfg.defaultRealm != null) + { default_realm = cfg.defaultRealm; }; + + realms = optionalAttrs (lib.all (value: value != null) [ + cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer + ]) { + "${cfg.defaultRealm}" = { + kdc = cfg.kdc; + admin_server = cfg.kerberosAdminServer; + }; + }; + + domain_realm = optionalAttrs (lib.all (value: value != null) [ + cfg.domainRealm cfg.defaultRealm + ]) { + ".${cfg.domainRealm}" = cfg.defaultRealm; + "${cfg.domainRealm}" = cfg.defaultRealm; + }; + }; + + mergedConfig = (recursiveUpdate defaultConfig { + inherit (config.krb5) + kerberos libdefaults realms domain_realm capaths appdefaults plugins + extraConfig config; + }); + + filterEmbeddedMetadata = value: if isAttrs value then + (filterAttrs + (attrName: attrValue: attrName != "_module" && attrValue != null) + value) + else value; + + mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth)); + + mkRelation = name: value: "${name} = ${mkVal { inherit value; }}"; + + mkVal = { value, depth ? 0 }: + if (value == true) then "true" + else if (value == false) then "false" + else if (isInt value) then (toString value) + else if (isList value) then + concatMapStringsSep " " mkVal { inherit value depth; } + else if (isAttrs value) then + (concatStringsSep "\n${mkIndent (depth + 1)}" + ([ "{" ] ++ (mapAttrsToList + (attrName: attrValue: let + mappedAttrValue = mkVal { + value = attrValue; + depth = depth + 1; + }; + in "${attrName} = ${mappedAttrValue}") + value))) + "\n${mkIndent depth}}" + else value; + + mkMappedAttrsOrString = value: concatMapStringsSep "\n" + (line: if builtins.stringLength line > 0 + then "${mkIndent 1}${line}" + else line) + (splitString "\n" + (if isAttrs value then + concatStringsSep "\n" + (mapAttrsToList mkRelation value) + else value)); + +in { + + ###### interface + + options = { + krb5 = { + enable = mkEnableOption "Whether to enable Kerberos V."; + + kerberos = mkOption { + type = types.package; + default = pkgs.krb5Full; + defaultText = "pkgs.krb5Full"; + example = literalExample "pkgs.heimdalFull"; + description = '' + The Kerberos implementation that will be present in + <literal>environment.systemPackages</literal> after enabling this + service. + ''; + }; + + libdefaults = mkOption { + type = with types; either attrs lines; + default = {}; + apply = attrs: filterEmbeddedMetadata attrs; + example = literalExample '' + { + default_realm = "ATHENA.MIT.EDU"; + }; + ''; + description = '' + Settings used by the Kerberos V5 library. + ''; + }; + + realms = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "ATHENA.MIT.EDU" = { + admin_server = "athena.mit.edu"; + kdc = "athena.mit.edu"; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = "Realm-specific contact information and settings."; + }; + + domain_realm = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "example.com" = "EXAMPLE.COM"; + ".example.com" = "EXAMPLE.COM"; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Map of server hostnames to Kerberos realms. + ''; + }; + + capaths = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + "ATHENA.MIT.EDU" = { + "EXAMPLE.COM" = "."; + }; + "EXAMPLE.COM" = { + "ATHENA.MIT.EDU" = "."; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Authentication paths for non-hierarchical cross-realm authentication. + ''; + }; + + appdefaults = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + pam = { + debug = false; + ticket_lifetime = 36000; + renew_lifetime = 36000; + max_timeout = 30; + timeout_shift = 2; + initial_timeout = 1; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Settings used by some Kerberos V5 applications. + ''; + }; + + plugins = mkOption { + type = with types; either attrs lines; + default = {}; + example = literalExample '' + { + ccselect = { + disable = "k5identity"; + }; + }; + ''; + apply = attrs: filterEmbeddedMetadata attrs; + description = '' + Controls plugin module registration. + ''; + }; + + extraConfig = mkOption { + type = with types; nullOr lines; + default = null; + example = '' + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + description = '' + These lines go to the end of <literal>krb5.conf</literal> verbatim. + <literal>krb5.conf</literal> may include any of the relations that are + valid for <literal>kdc.conf</literal> (see <literal>man + kdc.conf</literal>), but it is not a recommended practice. + ''; + }; + + config = mkOption { + type = with types; nullOr lines; + default = null; + example = '' + [libdefaults] + default_realm = EXAMPLE.COM + + [realms] + EXAMPLE.COM = { + admin_server = kerberos.example.com + kdc = kerberos.example.com + default_principal_flags = +preauth + } + + [domain_realm] + example.com = EXAMPLE.COM + .example.com = EXAMPLE.COM + + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + description = '' + Verbatim <literal>krb5.conf</literal> configuration. Note that this + is mutually exclusive with configuration via + <literal>libdefaults</literal>, <literal>realms</literal>, + <literal>domain_realm</literal>, <literal>capaths</literal>, + <literal>appdefaults</literal>, <literal>plugins</literal> and + <literal>extraConfig</literal> configuration options. Consult + <literal>man krb5.conf</literal> for documentation. + ''; + }; + + defaultRealm = mkOption { + type = with types; nullOr str; + default = null; + example = "ATHENA.MIT.EDU"; + description = '' + DEPRECATED, please use + <literal>krb5.libdefaults.default_realm</literal>. + ''; + }; + + domainRealm = mkOption { + type = with types; nullOr str; + default = null; + example = "athena.mit.edu"; + description = '' + DEPRECATED, please create a map of server hostnames to Kerberos realms + in <literal>krb5.domain_realm</literal>. + ''; + }; + + kdc = mkOption { + type = with types; nullOr str; + default = null; + example = "kerberos.mit.edu"; + description = '' + DEPRECATED, please pass a <literal>kdc</literal> attribute to a realm + in <literal>krb5.realms</literal>. + ''; + }; + + kerberosAdminServer = mkOption { + type = with types; nullOr str; + default = null; + example = "kerberos.mit.edu"; + description = '' + DEPRECATED, please pass an <literal>admin_server</literal> attribute + to a realm in <literal>krb5.realms</literal>. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.kerberos ]; + + environment.etc."krb5.conf".text = if isString cfg.config + then cfg.config + else ('' + [libdefaults] + ${mkMappedAttrsOrString mergedConfig.libdefaults} + + [realms] + ${mkMappedAttrsOrString mergedConfig.realms} + + [domain_realm] + ${mkMappedAttrsOrString mergedConfig.domain_realm} + + [capaths] + ${mkMappedAttrsOrString mergedConfig.capaths} + + [appdefaults] + ${mkMappedAttrsOrString mergedConfig.appdefaults} + + [plugins] + ${mkMappedAttrsOrString mergedConfig.plugins} + '' + optionalString (mergedConfig.extraConfig != null) + ("\n" + mergedConfig.extraConfig)); + + warnings = flatten [ + (optional (cfg.defaultRealm != null) '' + The option krb5.defaultRealm is deprecated, please use + krb5.libdefaults.default_realm. + '') + (optional (cfg.domainRealm != null) '' + The option krb5.domainRealm is deprecated, please use krb5.domain_realm. + '') + (optional (cfg.kdc != null) '' + The option krb5.kdc is deprecated, please pass a kdc attribute to a + realm in krb5.realms. + '') + (optional (cfg.kerberosAdminServer != null) '' + The option krb5.kerberosAdminServer is deprecated, please pass an + admin_server attribute to a realm in krb5.realms. + '') + ]; + + assertions = [ + { assertion = !((builtins.any (value: value != null) [ + cfg.defaultRealm cfg.domainRealm cfg.kdc cfg.kerberosAdminServer + ]) && ((builtins.any (value: value != {}) [ + cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths + cfg.appdefaults cfg.plugins + ]) || (builtins.any (value: value != null) [ + cfg.config cfg.extraConfig + ]))); + message = '' + Configuration of krb5.conf by deprecated options is mutually exclusive + with configuration by section. Please migrate your config using the + attributes suggested in the warnings. + ''; + } + { assertion = !(cfg.config != null + && ((builtins.any (value: value != {}) [ + cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths + cfg.appdefaults cfg.plugins + ]) || (builtins.any (value: value != null) [ + cfg.extraConfig cfg.defaultRealm cfg.domainRealm cfg.kdc + cfg.kerberosAdminServer + ]))); + message = '' + Configuration of krb5.conf using krb.config is mutually exclusive with + configuration by section. If you want to mix the two, you can pass + lines to any configuration section or lines to krb5.extraConfig. + ''; + } + ]; + }; +} diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 4ec48b773358..97a30634dc7e 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -398,19 +398,15 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0 || join("", @id_info) =~ /ERROR:/) { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } - my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/; + my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/; if ($#ids > 0) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to find $mountPoint subvolume id from btrfs\n"; - } - my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; + my @paths = join("", @info) =~ m/^([^\n]*)/; if ($#paths > 0) { die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n"; } elsif ($#paths != 0) { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e849e634fc96..8ac7e5b52d69 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,7 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix - ./config/krb5.nix + ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix ./config/no-x-libs.nix @@ -269,6 +269,7 @@ ./services/mail/offlineimap.nix ./services/mail/opendkim.nix ./services/mail/opensmtpd.nix + ./services/mail/pfix-srsd.nix ./services/mail/postfix.nix ./services/mail/postsrsd.nix ./services/mail/postgrey.nix @@ -621,6 +622,7 @@ ./services/web-servers/phpfpm/default.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix + ./services/web-servers/traefik.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix new file mode 100644 index 000000000000..ab5f4c39e8c2 --- /dev/null +++ b/nixos/modules/services/mail/pfix-srsd.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.pfix-srsd = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to run the postfix sender rewriting scheme daemon."; + }; + + domain = mkOption { + description = "The domain for which to enable srs"; + type = types.str; + example = "example.com"; + }; + + secretsFile = mkOption { + description = '' + The secret data used to encode the SRS address. + to generate, use a command like: + <literal>for n in $(seq 5); do dd if=/dev/urandom count=1 bs=1024 status=none | sha256sum | sed 's/ -$//' | sed 's/^/ /'; done</literal> + ''; + type = types.path; + default = "/var/lib/pfix-srsd/secrets"; + }; + }; + }; + + ###### implementation + + config = mkIf config.services.pfix-srsd.enable { + environment = { + systemPackages = [ pkgs.pfixtools ]; + }; + + systemd.services."pfix-srsd" = { + description = "Postfix sender rewriting scheme daemon"; + before = [ "postfix.service" ]; + #note that we use requires rather than wants because postfix + #is unable to process (almost) all mail without srsd + requiredBy = [ "postfix.service" ]; + serviceConfig = { + Type = "forking"; + PIDFile = "/var/run/pfix-srsd.pid"; + ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; + }; + }; + }; +} \ No newline at end of file diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index d88a38def82c..ad4e58149847 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -79,6 +79,12 @@ let // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; } // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } + // optionalAttrs cfg.useSrs { + sender_canonical_maps = "tcp:127.0.0.1:10001"; + sender_canonical_classes = "envelope_sender"; + recipient_canonical_maps = "tcp:127.0.0.1:10002"; + recipient_canonical_classes= "envelope_recipient"; + } // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_CAfile = cfg.sslCACert; @@ -626,6 +632,12 @@ in description = "Maps to be compiled and placed into /var/lib/postfix/conf."; }; + useSrs = mkOption { + type = types.bool; + default = false; + description = "Whether to enable sender rewriting scheme"; + }; + }; }; @@ -646,6 +658,8 @@ in systemPackages = [ pkgs.postfix ]; }; + services.pfix-srsd.enable = config.services.postfix.useSrs; + services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail { program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 280c66d0aaf2..0fa9e417785f 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -414,7 +414,7 @@ in { Make sure the secret is an RSA private key in PEM format. You can generate one with - openssl genrsa 2048openssl genpkey -algorithm RSA -out - -pkeyopt rsa_keygen_bits:2048 + openssl genrsa 2048 ''; }; @@ -567,6 +567,7 @@ in { mkdir -p ${cfg.statePath}/log mkdir -p ${cfg.statePath}/tmp/pids mkdir -p ${cfg.statePath}/tmp/sockets + mkdir -p ${cfg.statePath}/shell rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index f9636f8e1278..4b00f50abd63 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -66,6 +66,35 @@ services.gitlab = { db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + jws = '' + -----BEGIN RSA PRIVATE KEY----- + MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK + ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm + hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q + SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP + eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i + s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x + 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz + xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd + KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/ + 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6 + LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2 + ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21 + 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad + U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk + EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46 + 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi + fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv + wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU + TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi + GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz + wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV + J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w + 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI + YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4 + Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g== + -----END RSA PRIVATE KEY----- + ''; }; extraConfig = { gitlab = { diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index d6e827a53fdf..f6d326e43d94 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -25,6 +25,7 @@ let HTTP_ADDR = ${cfg.httpAddress} HTTP_PORT = ${toString cfg.httpPort} ROOT_URL = ${cfg.rootUrl} + STATIC_ROOT_PATH = ${cfg.staticRootPath} [session] COOKIE_NAME = session @@ -175,6 +176,13 @@ in ''; }; + staticRootPath = mkOption { + type = types.str; + default = "${pkgs.gogs.data}"; + example = "/var/lib/gogs/data"; + description = "Upper level of template and static files path."; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -195,6 +203,8 @@ in runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; in '' + mkdir -p ${cfg.stateDir} + # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' mkdir -p ${cfg.stateDir}/custom/conf @@ -240,7 +250,7 @@ in }; }; - users = { + users = mkIf (cfg.user == "gogs") { extraUsers.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 8d3d4f2065ec..beaa2c01b298 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let # proxy_password: password # tags: mytag0, mytag1 - ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"} + ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"} # collect_ec2_tags: no # recent_point_threshold: 30 diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 15777d45f785..8ac9f801dcb8 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -156,7 +156,7 @@ in wantedBy = [ "multi-user.target" ]; requires = lib.optional cfg.useRpcbind "rpcbind.service"; - after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind [ "rpcbind.service" ]; + after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service"; preStart = '' install -m 0755 -d /var/log/glusterfs diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 36e5efecf431..d4a695ef5880 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -7,7 +7,7 @@ let ipfsFlags = toString ([ (optionalString cfg.autoMount "--mount") - (optionalString cfg.autoMigrate "--migrate") + #(optionalString cfg.autoMigrate "--migrate") (optionalString cfg.enableGC "--enable-gc") (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") (optionalString (cfg.defaultMode == "offline") "--offline") @@ -36,6 +36,7 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; + # NB: migration must be performed prior to pre-start, else we get the failure message! preStart = '' ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) ipfs --local config Addresses.API ${cfg.apiAddress} @@ -97,11 +98,17 @@ in { description = "systemd service that is enabled by default"; }; + /* autoMigrate = mkOption { type = types.bool; default = false; - description = "Whether IPFS should try to migrate the file system automatically"; + description = '' + Whether IPFS should try to migrate the file system automatically. + + The daemon will need to be able to download a binary from https://ipfs.io to perform the migration. + ''; }; + */ autoMount = mkOption { type = types.bool; diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix index cf1d7617cca6..8b972ba971e6 100644 --- a/nixos/modules/services/network-filesystems/kbfs.nix +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -55,6 +55,7 @@ in { Restart = "on-failure"; PrivateTmp = true; }; + wantedBy = [ "default.target" ]; }; services.keybase.enable = true; diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix index ca5c279ac6f0..7c7982ee8eac 100644 --- a/nixos/modules/services/networking/keybase.nix +++ b/nixos/modules/services/networking/keybase.nix @@ -28,11 +28,12 @@ in { description = "Keybase service"; serviceConfig = { ExecStart = '' - ${pkgs.keybase}/bin/keybase service + ${pkgs.keybase}/bin/keybase -d service --auto-forked ''; Restart = "on-failure"; PrivateTmp = true; }; + wantedBy = [ "default.target" ]; }; environment.systemPackages = [ pkgs.keybase ]; diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 16530078b978..9087b75c29c1 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -3,7 +3,6 @@ with lib; let - pkg = pkgs.softether; cfg = config.services.softether; in @@ -17,6 +16,15 @@ in enable = mkEnableOption "SoftEther VPN services"; + package = mkOption { + type = types.package; + default = pkgs.softether; + defaultText = "pkgs.softether"; + description = '' + softether derivation to use. + ''; + }; + vpnserver.enable = mkEnableOption "SoftEther VPN Server"; vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge"; @@ -41,7 +49,7 @@ in dataDir = mkOption { type = types.string; - default = "${pkg.dataDir}"; + default = "${cfg.package.dataDir}"; description = '' Data directory for SoftEther VPN. ''; @@ -57,12 +65,13 @@ in mkMerge [{ environment.systemPackages = [ - (pkgs.lib.overrideDerivation pkg (attrs: { + (pkgs.lib.overrideDerivation cfg.package (attrs: { dataDir = cfg.dataDir; })) ]; systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; @@ -71,11 +80,11 @@ in for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d - install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 fi done rm -rf ${cfg.dataDir}/vpncmd/vpncmd - ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ''; }; } @@ -83,17 +92,17 @@ in (mkIf (cfg.vpnserver.enable) { systemd.services.vpnserver = { description = "SoftEther VPN Server"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnserver start"; - ExecStop = "${pkg}/bin/vpnserver stop"; + ExecStart = "${cfg.package}/bin/vpnserver start"; + ExecStop = "${cfg.package}/bin/vpnserver stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver - ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ''; postStop = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -104,17 +113,17 @@ in (mkIf (cfg.vpnbridge.enable) { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnbridge start"; - ExecStop = "${pkg}/bin/vpnbridge stop"; + ExecStart = "${cfg.package}/bin/vpnbridge start"; + ExecStop = "${cfg.package}/bin/vpnbridge stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge - ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ''; postStop = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -125,17 +134,17 @@ in (mkIf (cfg.vpnclient.enable) { systemd.services.vpnclient = { description = "SoftEther VPN Client"; - after = [ "softether-init.service" "network.target" ]; - wants = [ "softether-init.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + requires = [ "softether-init.service" ]; + wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${pkg}/bin/vpnclient start"; - ExecStop = "${pkg}/bin/vpnclient stop"; + ExecStart = "${cfg.package}/bin/vpnclient start"; + ExecStop = "${cfg.package}/bin/vpnclient stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient - ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ''; postStart = '' sleep 1 diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 3d9cec46a582..72313ab2ee14 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -329,7 +329,7 @@ in }; mutable = mkOption { - default = false; + default = true; type = types.bool; description = '' Indicates whether to allow the contents of the `dataDir` directory to be changed diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix new file mode 100644 index 000000000000..4ede4fc20967 --- /dev/null +++ b/nixos/modules/services/web-servers/traefik.nix @@ -0,0 +1,115 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.traefik; + configFile = + if cfg.configFile == null then + pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ + > $out + '' + else cfg.configFile; + +in { + options.services.traefik = { + enable = mkEnableOption "Traefik web server"; + + configFile = mkOption { + default = null; + example = literalExample "/path/to/config.toml"; + type = types.nullOr types.path; + description = '' + Path to verbatim traefik.toml to use. + (Using that option has precedence over <literal>configOptions</literal>) + ''; + }; + + configOptions = mkOption { + description = '' + Config for Traefik. + ''; + type = types.attrs; + default = { + defaultEntryPoints = ["http"]; + entryPoints.http.address = ":80"; + }; + example = { + defaultEntrypoints = [ "http" ]; + web.address = ":8080"; + entryPoints.http.address = ":80"; + + file = {}; + frontends = { + frontend1 = { + backend = "backend1"; + routes.test_1.rule = "Host:localhost"; + }; + }; + backends.backend1 = { + servers.server1.url = "http://localhost:8000"; + }; + }; + }; + + dataDir = mkOption { + default = "/var/lib/traefik"; + type = types.path; + description = '' + Location for any persistent data traefik creates, ie. acme + ''; + }; + + package = mkOption { + default = pkgs.traefik; + defaultText = "pkgs.traefik"; + type = types.package; + description = "Traefik package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.traefik = { + description = "Traefik web server"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + PermissionsStartOnly = true; + ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}''; + ExecStartPre = [ + ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"'' + ''${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'' + ''${pkgs.coreutils}/bin/chown -R traefik:traefik "${cfg.dataDir}"'' + ]; + Type = "simple"; + User = "traefik"; + Group = "traefik"; + Restart = "on-failure"; + StartLimitInterval = 86400; + StartLimitBurst = 5; + AmbientCapabilities = "cap_net_bind_service"; + CapabilityBoundingSet = "cap_net_bind_service"; + NoNewPrivileges = true; + LimitNPROC = 64; + LimitNOFILE = 1048576; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "full"; + ReadWriteDirectories = cfg.dataDir; + }; + }; + + users.extraUsers.traefik = { + group = "traefik"; + home = cfg.dataDir; + createHome = true; + }; + + users.extraGroups.traefik = {}; + }; +} diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index cc9d0ef37d59..3a8999c242bd 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -5,7 +5,8 @@ system.fsPackages = [ pkgs.e2fsprogs ]; - boot.initrd.availableKernelModules = [ "ext2" "ext3" "ext4" ]; + # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko) + boot.initrd.availableKernelModules = [ "ext2" "ext4" ]; boot.initrd.extraUtilsCommands = '' diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix index 0ec4974789b4..609831506e16 100644 --- a/nixos/modules/tasks/powertop.nix +++ b/nixos/modules/tasks/powertop.nix @@ -16,6 +16,7 @@ in { powertop = { wantedBy = [ "multi-user.target" ]; description = "Powertop tunings"; + path = [ pkgs.kmod ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 745518f85972..14826b6272f7 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,5 +223,21 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - latest = self."17.03"; + # 17.09.1483.d0f0657ca0 + "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6"; + "17.09".eu-west-2.hvm-ebs = "ami-7d061419"; + "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a"; + "17.09".us-east-1.hvm-ebs = "ami-6f669d15"; + "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae"; + "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd"; + "17.09".us-west-2.hvm-ebs = "ami-d3956fab"; + "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a"; + "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e"; + "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be"; + "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66"; + "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f"; + "17.09".sa-east-1.hvm-ebs = "ami-0377086f"; + "17.09".ap-south-1.hvm-ebs = "ami-4a064625"; + + latest = self."17.09"; }; in self diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 5039118d78ee..2cb932d208f0 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -24,7 +24,12 @@ with lib; copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart + + substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ + --replace "awk" "gawk" \ + --replace "sed" "gnused" + ln -s sed $out/bin/gnused ''; diff --git a/nixos/tests/krb5/default.nix b/nixos/tests/krb5/default.nix new file mode 100644 index 000000000000..dd5b2f37202e --- /dev/null +++ b/nixos/tests/krb5/default.nix @@ -0,0 +1,5 @@ +{ system ? builtins.currentSystem }: +{ + example-config = import ./example-config.nix { inherit system; }; + deprecated-config = import ./deprecated-config.nix { inherit system; }; +} diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix new file mode 100644 index 000000000000..980b3e762dc6 --- /dev/null +++ b/nixos/tests/krb5/deprecated-config.nix @@ -0,0 +1,48 @@ +# Verifies that the configuration suggested in deprecated example values +# will result in the expected output. + +import ../make-test.nix ({ pkgs, ...} : { + name = "krb5-with-deprecated-config"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eqyiel ]; + }; + + machine = + { config, pkgs, ... }: { + krb5 = { + enable = true; + defaultRealm = "ATHENA.MIT.EDU"; + domainRealm = "athena.mit.edu"; + kdc = "kerberos.mit.edu"; + kerberosAdminServer = "kerberos.mit.edu"; + }; + }; + + testScript = + let snapshot = pkgs.writeText "krb5-with-deprecated-config.conf" '' + [libdefaults] + default_realm = ATHENA.MIT.EDU + + [realms] + ATHENA.MIT.EDU = { + admin_server = kerberos.mit.edu + kdc = kerberos.mit.edu + } + + [domain_realm] + .athena.mit.edu = ATHENA.MIT.EDU + athena.mit.edu = ATHENA.MIT.EDU + + [capaths] + + + [appdefaults] + + + [plugins] + + ''; + in '' + $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + ''; +}) diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix new file mode 100644 index 000000000000..d5328720931e --- /dev/null +++ b/nixos/tests/krb5/example-config.nix @@ -0,0 +1,106 @@ +# Verifies that the configuration suggested in (non-deprecated) example values +# will result in the expected output. + +import ../make-test.nix ({ pkgs, ...} : { + name = "krb5-with-example-config"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eqyiel ]; + }; + + machine = + { config, pkgs, ... }: { + krb5 = { + enable = true; + kerberos = pkgs.krb5Full; + libdefaults = { + default_realm = "ATHENA.MIT.EDU"; + }; + realms = { + "ATHENA.MIT.EDU" = { + admin_server = "athena.mit.edu"; + kdc = "athena.mit.edu"; + }; + }; + domain_realm = { + "example.com" = "EXAMPLE.COM"; + ".example.com" = "EXAMPLE.COM"; + }; + capaths = { + "ATHENA.MIT.EDU" = { + "EXAMPLE.COM" = "."; + }; + "EXAMPLE.COM" = { + "ATHENA.MIT.EDU" = "."; + }; + }; + appdefaults = { + pam = { + debug = false; + ticket_lifetime = 36000; + renew_lifetime = 36000; + max_timeout = 30; + timeout_shift = 2; + initial_timeout = 1; + }; + }; + plugins = { + ccselect = { + disable = "k5identity"; + }; + }; + extraConfig = '' + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + }; + }; + + testScript = + let snapshot = pkgs.writeText "krb5-with-example-config.conf" '' + [libdefaults] + default_realm = ATHENA.MIT.EDU + + [realms] + ATHENA.MIT.EDU = { + admin_server = athena.mit.edu + kdc = athena.mit.edu + } + + [domain_realm] + .example.com = EXAMPLE.COM + example.com = EXAMPLE.COM + + [capaths] + ATHENA.MIT.EDU = { + EXAMPLE.COM = . + } + EXAMPLE.COM = { + ATHENA.MIT.EDU = . + } + + [appdefaults] + pam = { + debug = false + initial_timeout = 1 + max_timeout = 30 + renew_lifetime = 36000 + ticket_lifetime = 36000 + timeout_shift = 2 + } + + [plugins] + ccselect = { + disable = k5identity + } + + [logging] + kdc = SYSLOG:NOTICE + admin_server = SYSLOG:NOTICE + default = SYSLOG:NOTICE + ''; + in '' + $machine->succeed("diff /etc/krb5.conf ${snapshot}"); + ''; +}) diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index 2cf2963ae316..d186c42a2a98 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -1,42 +1,37 @@ -import ./make-test.nix ({ pkgs, ...} : +import ./make-test.nix ({ pkgs, lib, ...}: let - test = pkgs.writeText "test.sql" '' - CREATE EXTENSION pgcrypto; - CREATE EXTENSION pgjwt; - select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret'); - select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret'); + test = with pkgs; runCommand "patch-test" { + nativeBuildInputs = [ pgjwt ]; + } + '' + sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out; ''; in -{ +with pkgs; { name = "pgjwt"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ spinus ]; + meta = with lib.maintainers; { + maintainers = [ spinus willibutz ]; }; nodes = { - master = - { pkgs, config, ... }: - - { - services.postgresql = let mypg = pkgs.postgresql95; in { - enable = true; - package = mypg; - extraPlugins =[pkgs.pgjwt]; - initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; + master = { pkgs, config, ... }: + { + services.postgresql = { + enable = true; + extraPlugins = [ pgjwt pgtap ]; }; + }; }; - testScript = '' + testScript = { nodes, ... }: + let + sqlSU = "${nodes.master.config.services.postgresql.superUser}"; + pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; + in + '' startAll; $master->waitForUnit("postgresql"); - $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'"); - $master->succeed("cat ${test} | psql postgres"); - # I can't make original test working :[ - # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql"); - + $master->copyFileFromHost("${test}","/tmp/test.sql"); + $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"); ''; }) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index d3800062b119..a113aadcd628 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt5, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt5" ]; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index d2878a17fb3a..9a2145d91cfb 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; }; + patches = [ ./fix-bitcoin-qt-build.patch ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" ]; meta = { description = "Peer-to-peer electronic cash system (Classic client)"; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c604a9370a84..0264ce397762 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,17 +1,17 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; - bitcoin-abc = callPackage ./bitcoin-abc.nix { withGui = true; }; + bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; + bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; @@ -26,7 +26,10 @@ rec { dogecoind = callPackage ./dogecoin.nix { withGui = false; }; freicoin = callPackage ./freicoin.nix { boost = boost155; }; - go-ethereum = callPackage ./go-ethereum.nix { }; + go-ethereum = callPackage ./go-ethereum.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; go-ethereum-classic = callPackage ./go-ethereum-classic { }; hivemind = callPackage ./hivemind.nix { withGui = true; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 4cf68fb76fd6..279e767173a2 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,10 +1,14 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.0"; + version = "1.7.1"; goPackagePath = "github.com/ethereum/go-ethereum"; + # Fix for usb-related segmentation faults on darwin + propagatedBuildInputs = + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -12,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh"; + sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; }; # Fix cyclic referencing on Darwin diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 9efab9a8babb..24b891d60eb2 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec{ sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8"; }; - buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; qmakeFlags = ["USE_UPNP=-"]; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index e6ed05dd27f1..b1e3dc2dd93d 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec{ qmakeFlags = ["USE_UPNP=-"]; makeFlags = ["USE_UPNP=-"]; - buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 9942f0898a2f..4a4665291d6e 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation { leaveDotGit = true; }; - buildInputs = [ autoconf automake libtool pkgconfig git ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool git ]; propagatedBuildInputs = [ bison flex postgresql ]; diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index 5eb4a3212462..aa912f04efb5 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index efb69d4c481f..ad12609429f5 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; - buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 06e143704224..115df15d2a57 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { doCheck = false; - buildInputs = [ alsaLib minixml jack2Full pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib minixml jack2Full ]; meta = with stdenv.lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index fbbb9f90f8a5..bc72c3e13144 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x"; }; - buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index a4debfe37440..850848abcde6 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.11"; + tag = "5.12"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; - rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71"; - sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay"; + rev = "ae0dcdc0c5d13483271065c360e378202d20170a"; + sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"; }; buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac + [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 29d0241fa02f..afb3c8342731 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { patches = [ ./glib-single-include.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + gettext gtk2 expat intltool libgcrypt libunique gnutls libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib ]; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 568195c1dba7..9a9095d2fc12 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; }; - buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { homepage = http://openavproductions.com/artyfx/; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index b5897c71cd94..99d6357e9216 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; }; - buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libcddb intltool makeWrapper ]; runtimeDeps = optional mp3Support lame ++ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 3fb9faa26671..07385e2a8b85 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -51,8 +51,9 @@ stdenv.mkDerivation rec { "-lswscale" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig file gettext wxGTK30 expat alsaLib + file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch autoconf automake libtool # for the preConfigure phase diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix new file mode 100644 index 000000000000..986e476779cb --- /dev/null +++ b/pkgs/applications/audio/axoloti/default.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip +, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }: + +stdenv.mkDerivation rec { + version = "1.0.12-1"; + name = "axoloti-${version}"; + + src = fetchFromGitHub { + owner = "axoloti"; + repo = "axoloti"; + rev = "${version}"; + sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50"; + }; + + chibi_version = "2.6.9"; + chibi_name = "ChibiOS_${chibi_version}"; + + chibios = fetchurl { + url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; + sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; + }; + + buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ]; + + patchPhase = '' + unzip ${chibios} + mv ${chibi_name} chibios + (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) + + # Remove source of non-determinism in ChibiOS + substituteInPlace "chibios/os/various/shell.c" \ + --replace "#ifdef __DATE__" "#if 0" + + # Hardcode full path to compiler tools + for f in "firmware/Makefile.patch" \ + "firmware/Makefile" \ + "firmware/flasher/Makefile" \ + "firmware/mounter/Makefile"; do + substituteInPlace "$f" \ + --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-" + done + + # Hardcode path to "make" + for f in "firmware/compile_firmware_linux.sh" \ + "firmware/compile_patch_linux.sh"; do + substituteInPlace "$f" \ + --replace "make" "${gnumake}/bin/make" + done + + # Hardcode dfu-util path + substituteInPlace "platform_linux/upload_fw_dfu.sh" \ + --replace "/bin/dfu-util" "" + substituteInPlace "platform_linux/upload_fw_dfu.sh" \ + --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" + + # Fix build version + substituteInPlace "build.xml" \ + --replace "(git missing)" "${version}" + + # Remove build time + substituteInPlace "build.xml" \ + --replace "<tstamp>" "" + substituteInPlace "build.xml" \ + --replace \ + '<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \ + '<property name="build.time" value=""/>' + substituteInPlace "build.xml" \ + --replace "</tstamp>" "" + substituteInPlace "build.xml" \ + --replace \ + '{line.separator}</echo>' \ + '{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />' + ''; + + buildPhase = '' + find . -exec touch -d '1970-01-01 00:00' {} \; + (cd platform_linux; sh compile_firmware.sh) + faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/axoloti + + cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ + install -vD dist/Axoloti.jar $out/share/axoloti/ + + makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" + ''; + + meta = with stdenv.lib; { + homepage = http://www.axoloti.com; + description = '' + Sketching embedded digital audio algorithms. + + To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>: + <literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal> + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ TealG ]; + }; +} diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix new file mode 100644 index 000000000000..2076e45de546 --- /dev/null +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }: + +stdenv.mkDerivation rec { + name="dfu-util-${version}"; + version = "0.8"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1-axoloti ]; + + src = fetchurl { + url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; + }; + + meta = with stdenv.lib; { + description = "Device firmware update (DFU) USB programmer"; + longDescription = '' + dfu-util is a program that implements the host (PC) side of the USB + DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. + + DFU is intended to download and upload firmware to devices connected over + USB. It ranges from small devices like micro-controller boards up to mobile + phones. With dfu-util you are able to download firmware to your device or + upload firmware from it. + ''; + homepage = http://dfu-util.gnumonks.org/; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix new file mode 100644 index 000000000000..cf71c006046e --- /dev/null +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: + +stdenv.mkDerivation rec { + name = "libusb-1.0.19"; + + src = fetchurl { + url = "mirror://sourceforge/libusb/${name}.tar.bz2"; + sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; + }; + + outputs = [ "out" "dev" ]; # get rid of propagating systemd closure + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = + stdenv.lib.optional stdenv.isLinux systemd ++ + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + + patches = [ + (fetchpatch { + name = "libusb.stdfu.patch"; + url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; + sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; + }) + ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + ''; + + meta = { + homepage = http://www.libusb.info; + description = "User-space USB library"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index ca3148f0e0a4..32daf000dc59 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; - buildInputs = [ libjack2 gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 gtk2 ]; meta = with stdenv.lib; { homepage = http://devel.tlrmx.org/audio/bitmeter/; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 28155fd23178..42e99fa51863 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext xorg.xproto ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f09791d9aa1f..35fe510cbb2b 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -34,20 +34,21 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.1.0"; + version = "2.2.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); -in -stdenv.mkDerivation rec { + withUdisks = (withTaglib && withDevices); + +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh"; + sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; buildInputs = [ vlc ] @@ -60,43 +61,37 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withLame lame ++ stdenv.lib.optional withMtp libmtp ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + ++ stdenv.lib.optional withUdisks udisks2; nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") + (fstat withQt5 "QT5") + (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) + (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withCdda "CDPARANOIA") + (fstat withCddb "CDDB") + (fstat withLame "LAME") + (fstat withMtp "MTP") + (fstat withMusicbrainz "MUSICBRAINZ") (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withStreams "STREAMS") + (fstat withDynamic "DYNAMIC") + (fstat withDevices "DEVICES_SUPPORT") + (fstat withHttpServer "HTTP_SERVER") + (fstat withStreams "STREAMS") + (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" - "-DENABLE_UDISKS2=ON" ]; - # This is already fixed upstream but not released yet. Maybe in version 2. - preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake - ''; - meta = with stdenv.lib; { - homepage = https://github.com/cdrummond/cantata; + homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; - license = licenses.gpl3; - + license = licenses.gpl3; + maintainers = with maintainers; [ fuuzetsu peterhoeg ]; # Technically Cantata can run on Windows so if someone wants to # bother figuring that one out, be my guest. - platforms = platforms.linux; - maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 633ba3832c2c..c0dd2e92178c 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -116,7 +116,8 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - buildInputs = [ ncurses pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.cc.isClang clangGCC ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ concatMap (a: a.deps) opts; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 9d157833c0d9..a80cc36b2164 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sed -e "s#@./scripts#sh scripts#" -i Makefile ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 + alsaLib fftwSinglePrec freetype libjack2 premake3 xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender ladspa-sdk ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 35079ea27385..3faeeb12d4c6 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; - buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 11a0576bf437..8d7db50fd323 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - buildInputs = [ pkgconfig unzip portaudio wxGTK ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip portaudio wxGTK ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index b9e98281a7c6..4875ee8b57da 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -158,7 +158,8 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 274f7c9c3b84..901df19ebf59 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -187,7 +187,8 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index bb37cac5500e..a8bf05187e33 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreAudio -framework CoreServices"; - buildInputs = [ glib libsndfile pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsndfile ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index 22944ffefe44..58d095080fe5 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; }; - buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtkmm2 lv2 lvtk ]; buildPhase = '' cd lv2 diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index bdac87aaf374..367b1db139d5 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; - buildInputs = [ lv2 pkgconfig python2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python2 ]; installPhase = '' python waf configure --prefix=$out diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 073d28ef8703..28b2cd98e02c 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq"; }; - buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 gtk2 lv2 faust ]; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index ab6dd0eee72f..50b1bcde58f3 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - buildInputs = [ pkgconfig glib ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; }; src = fetchurl { @@ -22,8 +24,9 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup + libtool intltool glib gtk2 curl mpd_clientlib libsoup libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index d68a48da0902..f5887e870db6 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { name = "gnaural-1.0.20110606"; - buildInputs = [ pkgconfig gtk2 libsndfile portaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile portaudio ]; src = fetchurl { url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 1b1bf437ce9d..7ebdce783527 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; - buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme hicolor_icon_theme ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 686a6b67e6aa..d68bfbf2ae4e 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4 + alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index d56ac7534053..c26980e1bb26 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ alsaLib pkgconfig qtbase qtscript ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ alsaLib qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 0b0df0b55e4f..ca806aad02fe 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index ec7f7a5c32db..f1e00e876730 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; }; - buildInputs = [ libjack2 libsndfile pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 libsndfile ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 5f796a29035b..a75513ff059e 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - buildInputs = [ SDL libjack2 mesa pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL libjack2 mesa ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 1d1925779f0d..d68e67d19dd4 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index c709483a3b21..060b7f703a31 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - buildInputs = [ libjack2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ]; meta = { description = "Console jack loudness meter"; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index f0cd3bd04279..aa78527d787e 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./no_error.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig scons qt4 lash diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index e2c86256ce64..99c3e48ae84d 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 4af53389ffdf..77946fc41ccc 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl + fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl perlXMLParser makeWrapper ]; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index c51795e756c5..3a0da876acfc 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ]; NIX_CFLAGS_COMPILE = "-fpermissive"; buildPhase = '' diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 1b68caccf4ec..a60b3db2fb86 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ]; patchPhase = '' patchShebangs . diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 47b65ff2b5a3..65df1b89430e 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 alsaLib libglade ]; configureFlags = "--disable-jack"; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index ba1d88373fff..a8e33c23dc0d 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - buildInputs = [ makeWrapper pkgconfig MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index a7c8098dd79a..d3821c51fbc6 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx"; }; - buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib lilv lv2 serd sord sratom ]; installPhase = '' make install PREFIX=$out diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 9d3cdc2eea38..c7d0caec8bf5 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; - buildInputs = [ fftwSinglePrec lv2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftwSinglePrec lv2 python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index e412f31f3168..f4245b0a51e3 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -25,7 +25,8 @@ in stdenv.mkDerivation { inherit name; - buildInputs = [ pkgconfig lv2 mesa gtk2 cairo pango fftw ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 mesa gtk2 cairo pango fftw ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 025d216910ea..2e293ee4552d 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; }; - buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; meta = { description = "General-purpose software audio FSK modem"; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 6e2312c33907..05d041380a09 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.4.1"; + version = "3.4.9"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx"; + sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb"; }; propagatedBuildInputs = [ @@ -16,6 +16,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.configobj pythonPackages.pylast pythonPackages.spotipy + pythonPackages.raven ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 1a1ebc56a841..6700f21fc8cc 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - buildInputs = [ ncurses pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 59adb7cde497..73352b650921 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion} - export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} - ''; - meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index e43120a715d6..ef0bb75b2ec0 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,36 +1,35 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses +, mpd_clientlib, gettext }: -stdenv.mkDerivation rec { +let + rpath = stdenv.lib.makeLibraryPath [ + glib ncurses mpd_clientlib + ]; +in stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr"; + sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; }; buildInputs = [ glib ncurses mpd_clientlib ]; - # ++ libintlOrEmpty; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - # without this, po/Makefile.in.in is not being created - preAutoreconf = '' - ./autogen.sh + postFixup = '' + for elf in "$out"/bin/*; do + patchelf --set-rpath '${rpath}':"$out/lib" "$elf" + done ''; - configureFlags = [ - "--enable-colors" - "--enable-lyrics-screen" - ]; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index f4e5998c0375..3b429290f7c8 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx"; }; - buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblrdf liblo libsigcxx ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index b361e6c33ae4..6b50ee1426ce 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - buildInputs = [ scons boost ladspaH pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons boost ladspaH ]; patchPhase = '' # remove TERM: diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index da0f74848888..5d13aa7daf42 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation rec { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; }; - buildInputs = [ SDL2 pkgconfig flac libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 flac libsndfile ]; makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 7dc3e00ebf7b..8e591487111b 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libao json_c libgcrypt libav curl + libao json_c libgcrypt libav curl ]; makeFlags="PREFIX=$(out)"; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 556582c34f79..5529998803cf 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; - buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 52f2a0ff924c..2bb2960afbf1 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - buildInputs = [ alsaLib gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib gtk2 ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index badac0887a1a..1e76e769937b 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; }; - buildInputs = [ pkgconfig qt4 alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 alsaLib ]; meta = with stdenv.lib; { description = "MIDI event processor and router"; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 692938884b63..1211570f9bc5 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx"; }; - buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake liblscp libtool qt4 ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix new file mode 100644 index 000000000000..4bc9371dd17b --- /dev/null +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig +# Transport +, curl +# Libraries +, boost +, jsoncpp +, libbsd +, pcre +# GUI/Desktop +, dbus +, glibmm +, gnome3 +, hicolor_icon_theme +, libappindicator-gtk3 +, libnotify +, libxdg_basedir +# GStreamer +, gst_all_1 +# User-agent info +, lsb-release +# rt2rtng +, python2 +# Testing +, gmock +# Fixup +, wrapGAppsHook +, makeWrapper +}: + +let + gstInputs = with gst_all_1; [ + gstreamer gst-plugins-base + gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav + ]; + # For the rt2rtng utility for converting bookmark file to -ng format + pythonInputs = with python2.pkgs; [ python2 lxml ]; +in +stdenv.mkDerivation rec { + name = "radiotray-ng-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "ebruck"; + repo = "radiotray-ng"; + rev = "v${version}"; + sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; + + buildInputs = [ + curl + boost jsoncpp libbsd pcre + glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + libxdg_basedir + lsb-release + ] ++ stdenv.lib.optional doCheck gmock + ++ gstInputs + ++ pythonInputs; + + prePatch = '' + substituteInPlace debian/CMakeLists.txt \ + --replace /usr $out + substituteInPlace include/radiotray-ng/common.hpp \ + --replace /usr $out + ''; + + patches = [ + (fetchpatch { + # Fix menu separators and minor touchup to 'version' + url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; + sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; + }) + ]; + + enableParallelBuilding = true; + + doCheck = true; + + checkPhase = "ctest"; + + preFixup = '' + gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) + wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH + ''; + + meta = with stdenv.lib; { + description = "An internet radio player for linux"; + homepage = https://github.com/ebruck/radiotray-ng; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e8bea3ec71c0..534fd2f0edb1 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -26,9 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig - python3 perl perlPackages.XMLParser diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 40ff47b9ee18..3ebdce2b4820 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 2a534047ae38..0eaa9bde14f6 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { -i b_synth/Makefile ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig + alsaLib freetype ftgl libjack2 libX11 lv2 mesa ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 8ac7a9115ca8..a60c3bef0daa 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { srcs = [ src robtkSrc ]; sourceRoot = src.name; - buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 pango cairo libjack2 mesa ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 9f8ad3e649b6..e91c08c30b77 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -16,8 +16,9 @@ in buildPythonApplication rec { disabled = !isPy3k; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool wrapGAppsHook + intltool wrapGAppsHook gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3c7be51554d8..d1c48ce44ed8 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -1,24 +1,33 @@ { stdenv , fetchFromGitHub -, qscintilla -, supercollider +, fftwSinglePrec , ruby +, libffi +, aubio , cmake , pkgconfig -, qt48Full +, qt5 +, libsForQt5 +, boost , bash , makeWrapper +, jack2Full }: -stdenv.mkDerivation rec { - version = "2.9.0"; +let + supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider { + fftw = fftwSinglePrec; + }; + +in stdenv.mkDerivation rec { + version = "3.0.1"; name = "sonic-pi-${version}"; src = fetchFromGitHub { owner = "samaaron"; repo = "sonic-pi"; rev = "v${version}"; - sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb"; + sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81"; }; buildInputs = [ @@ -26,24 +35,18 @@ stdenv.mkDerivation rec { cmake makeWrapper pkgconfig - qscintilla - qt48Full + qt5.qtbase + libsForQt5.qscintilla + libsForQt5.qwt ruby + libffi + aubio supercollider + boost ]; - meta = { - homepage = http://sonic-pi.net/; - description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.Phlogistique ]; - platforms = stdenv.lib.platforms.linux; - }; - dontUseCmakeConfigure = true; - patches = [ ./fixed-prefixes.patch ]; - preConfigure = '' patchShebangs . substituteInPlace app/gui/qt/mainwindow.cpp \ @@ -52,18 +55,45 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + export SONIC_PI_HOME=$TMPDIR + export AUBIO_LIB=${aubio}/lib/libaubio.so + pushd app/server/bin ./compile-extensions.rb + ./i18n-tool.rb -t popd pushd app/gui/qt - ./rp-build-app + cp -f ruby_help.tmpl ruby_help.h + ../../server/bin/qt-doc.rb -o ruby_help.h + + substituteInPlace SonicPi.pro \ + --replace "LIBS += -lrt -lqt5scintilla2" \ + "LIBS += -lrt -lqscintilla2 -lqwt" + + lrelease SonicPi.pro + qmake SonicPi.pro + + make popd ''; installPhase = '' + runHook preInstall + cp -r . $out - wrapProgram $out/bin/sonic-pi --prefix PATH : \ - ${ruby}/bin:${bash}/bin + wrapProgram $out/bin/sonic-pi \ + --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ + --set AUBIO_LIB "${aubio}/lib/libaubio.so" + + runHook postInstall ''; + + meta = { + homepage = http://sonic-pi.net/; + description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch deleted file mode 100644 index 7b045a41cba1..000000000000 --- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp -index 0af6cf7..97c17ad 100644 ---- a/app/gui/qt/mainwindow.cpp -+++ b/app/gui/qt/mainwindow.cpp -@@ -677,28 +677,9 @@ void MainWindow::startServer(){ - - serverProcess = new QProcess(); - -- QString root = rootPath(); -- -- #if defined(Q_OS_WIN) -- QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe"; -- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #elif defined(Q_OS_MAC) -- QString prg_path = root + "/server/native/osx/ruby/bin/ruby"; -- QString prg_arg = root + "/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #else -- //assuming Raspberry Pi -- QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby"; -- QFile file(prg_path); -- if(!file.exists()) { -- // use system ruby if bundled ruby doesn't exist -- prg_path = "/usr/bin/ruby"; -- } -- -- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb"; -- sample_path = root + "/etc/samples"; -- #endif -+ QString prg_path = "@ruby@"; -+ QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb"; -+ sample_path = "@out@/etc/samples"; - - prg_path = QDir::toNativeSeparators(prg_path); - prg_arg = QDir::toNativeSeparators(prg_arg); diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 979f15d4006b..cf0b5db81f62 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; - buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; installPhase = '' make install diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ba550580cba5..cbcdc0ecccd7 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; }; - buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index c6609814ea0b..7daae31a468b 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 83848671a3e5..86eefc395569 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; }; - buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 fftwFloat gtk2 ]; configurePhase= '' sed -i 's/.*home.*/#&/' ./Makefile substituteInPlace ./Makefile \ diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 32aac686043c..8af7888f74bb 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; }; - buildInputs = [ autoconf automake intltool pkgconfig ffmpeg wxGTK ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 10637fde8c7d..249bbe0d8fb7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.64.401.g9d720389-21"; + version = "1.0.64.407.g9bd02c2d-26"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "026khnz7n66mj94yr33690pmjm3pz1nsy38xggsyr5gldf1chsfc"; + sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 47d9381b2def..0fb1b77e7081 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; - buildInputs = [ pkgconfig glib libogg libvorbis ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libogg libvorbis ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index faa895e2e309..26ea46149203 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; - buildInputs = [ fftwSinglePrec lv2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftwSinglePrec lv2 ]; installPhase = "make install-system"; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 55e95c0fc156..8837566b13d0 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal"; }; - buildInputs = [ autoconf automake pkgconfig gtk2 libjack2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gtk2 libjack2 libsndfile ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 2787c65fc547..364949b22416 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon + cmake attica boost gnutls libechonest liblastfm lucenepp phonon qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 0a07e97270c4..de39c8ecc1cb 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation rec { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; }; - buildInputs = [ which libao pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libao ]; meta = with stdenv.lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 25292a4408f9..0270fb24d9e3 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi"; }; - buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ mpd_clientlib ncurses pcre taglib ]; postInstall = '' mkdir -p $out/etc diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 1f85f4423548..6b9af119859e 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { done ''; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with stdenv.lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 75368c6633be..2b509d8db60e 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; }; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 10b5bc0c117d..9aa24738c379 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; }; - buildInputs = [ pkgconfig alsaLib libxmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib libxmp ]; } diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 672237a8462f..c3e8efae7fe9 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; - buildInputs = [ cmake pkgconfig mpd_clientlib openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake mpd_clientlib openssl ]; meta = { homepage = http://www.ympd.org; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index ecb7d9bceec6..6067c5b1c75c 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px"; }; - buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ]; patchPhase = '' patchShebangs ./dpf/utils/generate-ttl.sh diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix new file mode 100644 index 000000000000..4d3a9a385d64 --- /dev/null +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext +, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook +, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror +, appstream-glib, desktop_file_utils, atk, pango, duplicity +}: + +stdenv.mkDerivation rec { + name = "deja-dup-${version}"; + version = "36.1"; + + src = fetchurl { + url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; + sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld"; + }; + + patches = [ + ./fix-paths.patch + ]; + + postPatch = '' + substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ + "/bin/rm" \ + "${coreutils}/bin/rm" + ''; + + # couldn't find gio/gdesktopappinfo.h + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + nativeBuildInputs = [ + meson ninja pkgconfig vala_0_38 gettext intltool itstool + appstream-glib desktop_file_utils libxml2 wrapGAppsHook + ]; + + buildInputs = [ + libnotify gnome3.libpeas glib gtk3 libsecret + pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus + at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + ]; + + propagatedUserEnvPkgs = [ duplicity ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed + postFixup = + let + rpath = stdenv.lib.makeLibraryPath [ + glib + gtk3 + gnome3.gnome_online_accounts + gnome3.libpeas + gnome3.nautilus + libgpgerror + libsecret + # Transitive + atk + pango + ]; + in '' + # Unwrap accidentally wrapped library + mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so + + for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do + patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" + done + ''; + + meta = with stdenv.lib; { + description = "A simple backup tool"; + longDescription = '' + Déjà Dup is a simple backup tool. It hides the complexity \ + of backing up the Right Way (encrypted, off-site, and regular) \ + and uses duplicity as the backend. + ''; + homepage = https://launchpad.net/deja-dup; + license = with licenses; gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch new file mode 100644 index 000000000000..1cc57e6a54a2 --- /dev/null +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -0,0 +1,12 @@ +diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build +index 04b136f3..ed8f7cba 100644 +--- a/deja-dup/nautilus/meson.build ++++ b/deja-dup/nautilus/meson.build +@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'], + link_with: [dirhandling], + dependencies: [nautilus_dep], + install: true, +- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir')) ++ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0')) + + endif diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 235d4d16a405..9dd7eb2a2994 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig lightdm intltool makeWrapper ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 6d7ed2e489b6..8ee5f0319aa1 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.14"; # "Android Studio 3.0 Beta 6" - build = "171.4333198"; - sha256Hash = "071a3j0bnsspvhvhh10h9ygay3bi66glriiy8gl8vrwx1dnv55zk"; + version = "3.0.0.15"; # "Android Studio 3.0 Beta 7" + build = "171.4365657"; + sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index 41a68656d007..61f927ef76bc 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: stdenv.mkDerivation rec { - name = "atom-${version}"; - version = "1.21.0-beta0"; + name = "atom-beta-${version}"; + version = "1.22.0-beta0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz"; + sha256 = "0xsj0vvaxjw60gg6niaws2lf9lkrh1sz7ypk41g6l4hdgmqyg6fi"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c77687d8758..33d78591151e 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i"; + sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h"; name = "${name}.deb"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node - rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git + rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index a3b4193edc6f..b9b0ee61c0b0 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -447,6 +447,28 @@ rec { }; }; + vrapper = buildEclipseUpdateSite rec { + name = "vrapper-${version}"; + version = "0.72.0"; + owner = "vrapper"; + repo = "vrapper"; + date = "20170311"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/${owner}/${repo}/releases/download/${version}/vrapper_${version}_${date}.zip"; + sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/vrapper/vrapper"; + description = "A wrapper to provide a Vim-like input scheme for moving around and editing text"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.stumoss ]; + }; + }; + yedit = buildEclipsePlugin rec { name = "yedit-${version}"; version = "1.0.20.201509041456"; diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index b4fb8d1937df..634c654d58fc 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5"; }; - buildInputs = [ emacs w3m texinfo autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ emacs w3m texinfo ]; # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? patchPhase = '' diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b0449cc7c424..ce9c4b3a46fd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -10171,6 +10171,27 @@ license = lib.licenses.free; }; }) {}; + company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }: + melpaBuild { + pname = "company-lean"; + version = "20170920.708"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; + sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a"; + name = "company-lean"; + }; + packageRequires = [ company dash dash-functional emacs f lean-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lean"; + license = lib.licenses.free; + }; + }) {}; company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; @@ -32722,6 +32743,27 @@ license = lib.licenses.free; }; }) {}; + helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }: + melpaBuild { + pname = "helm-lean"; + version = "20170919.934"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; + sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si"; + name = "helm-lean"; + }; + packageRequires = [ dash emacs helm lean-mode ]; + meta = { + homepage = "https://melpa.org/#/helm-lean"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -41631,6 +41673,27 @@ license = lib.licenses.free; }; }) {}; + lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + melpaBuild { + pname = "lean-mode"; + version = "20170920.755"; + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean-mode"; + rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; + sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; + sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj"; + name = "lean-mode"; + }; + packageRequires = [ dash dash-functional emacs f flycheck s ]; + meta = { + homepage = "https://melpa.org/#/lean-mode"; + license = lib.licenses.free; + }; + }) {}; leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 32998700c23e..de1e5e4c64bc 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; - buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 055816a798d3..dd3fb542da7c 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - buildInputs = [ intltool pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 44c61d16ec8d..53ea9741c03c 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake pkgconfig shared_mime_info intltool + autoconf automake shared_mime_info intltool mono gtk-sharp-2_0 gnome-sharp unzip - pkgconfig dotnetPackages.NUnit dotnetPackages.NUnitRunners dotnetPackages.Nuget diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index a9f236a57ae7..a6d624d4b1ec 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index d1fa03c54796..db74a58da43e 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -112,8 +112,9 @@ stdenv.mkDerivation rec { version = "9.3"; name = "textadept-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 glib pkgconfig unzip ncurses zip + gtk2 glib unzip ncurses zip ]; src = fetchhg { diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 876bd145b725..273ef33250fc 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; }; - buildInputs = [ pkgconfig vala_0_26 which autoconf automake + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_26 which autoconf automake libtool glib gtk3 libwnck3 asciidoc gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index bb265e90b770..144fb5428a51 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gettext ncurses pkgconfig luajit ruby tcl perl python + gettext ncurses luajit ruby tcl perl python ]; patches = [ ./macvim.patch ]; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f72af1908c50..02b8d991eae9 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.16.1"; + version = "1.17.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100"; - "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw"; - "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj"; + "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331"; + "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk"; + "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index fc2e8aa03de3..7213b22c949b 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.13"; + name = "zile-2.4.14"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; + sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s"; }; - buildInputs = [ pkgconfig ncurses boehmgc ]; - nativeBuildInputs = [ perl ] + buildInputs = [ ncurses boehmgc ]; + nativeBuildInputs = [ perl pkgconfig ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. ++ stdenv.lib.optional @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. - preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; + gl_cv_func_fstatat_zero_flag="yes"; meta = with stdenv.lib; { description = "Lightweight Emacs clone"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5e4e838f3452..3382bb3e56d7 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; }; - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 7396fdc045f1..990fee8cc37c 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -5,11 +5,13 @@ stdenv.mkDerivation rec { version = "0.0pre20160820"; name = "ao-${version}"; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11 + cmake ninja boost libpng glfw3 epoxy guile mesa libX11 libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes - ]; + ]; src = fetchgit { url = https://github.com/mkeeter/ao; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index f15730874744..3386d75e81e1 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; - buildInputs = [ openexr fltk pkgconfig mesa openexr_ctl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openexr fltk mesa openexr_ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index d49110d00693..097062a8258a 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; - buildInputs = [ stdenv pkgconfig openexr libpng12 libjpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv openexr libpng12 libjpeg ]; meta = with stdenv.lib; { description = "Collection of utilities for manipulating OpenEXR images"; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index b9cf229e8c86..3747b802e231 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; -buildInputs = [ gtk2 perl perlXMLParser pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; +buildInputs = [ gtk2 perl perlXMLParser ]; meta = { description = "Simple GTK+2 color selector"; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix new file mode 100644 index 000000000000..afad1e6c3af0 --- /dev/null +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : + +let + version = "2.2"; +in stdenv.mkDerivation { + name = "gcolor3-${version}"; + + src = fetchFromGitHub { + owner = "hjdskes"; + repo = "gcolor3"; + rev = "v${version}"; + sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; + }; + + nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + + buildInputs = [ gtk3 ]; + + configureScript = "./autogen.sh"; + + # clang-4.0: error: argument unused during compilation: '-pthread' + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument"; + + meta = { + description = "A simple color chooser written in GTK3"; + homepage = https://hjdskes.github.io/projects/gcolor3/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 9149e19819ff..1e8f0e209c06 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gps" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext + autoconf automake gtk2 libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 5c15c98e482b..92e6084ce673 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff json_glib ]; meta = { diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 7e11c9dea3a7..86867cd1cca7 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { platforms = platforms.unix; }; - buildInputs = [ intltool pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 801e9c5f502b..a892f98ac475 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - buildInputs = [pkgconfig gtk2 libpng]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index ee9df683c0a2..fd17ef69c992 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; - buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; preBuild = "cd src"; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 678ee79459be..889d710f043f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc + 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 cmake python2Env diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 5d0bbcad54fd..8817071e9843 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { qmake PREFIX="$out" ./qtikz.pro ''; - buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext qt5.full poppler_qt5 ]; enableParallelBuilding = true; } diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 0ca997adb783..33785a279c7b 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure ''; - buildInputs = [ libpng pkgconfig nasm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng nasm ]; meta = { description = "Mozilla JPEG Encoder Project"; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 51bfa603a055..8a2a218d9891 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle ]; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 9d147a635f3b..f1a58d4e21b8 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation (rec { sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 3edb97e3e209..91a34a505f2f 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,25 +1,26 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, lensfun }: stdenv.mkDerivation rec { - version = "5.2"; + version = "5.3"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k"; + sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; }; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx + cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun ]; - nativeBuildInputs = [ wrapGAppsHook ]; - cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix index 71e41faaaef5..fb73feb4a099 100644 --- a/pkgs/applications/graphics/rawtherapee/dev.nix +++ b/pkgs/applications/graphics/rawtherapee/dev.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz"; }; - buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 7037e944f3f9..42d129e53887 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -10,17 +10,17 @@ let udevRules = callPackage ./udev_rules_type1.nix {}; in stdenv.mkDerivation rec { - name = "brscan4-0.4.4-2"; + name = "brscan4-0.4.4-4"; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll"; + sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59"; + sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index de07a4f1a896..ad02e1a80231 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index f8db30675b15..7b30c467b199 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig zlib libpng cairo freetype + cmake zlib libpng cairo freetype json_c fontconfig gtkmm3 pangomm glew mesa_glu xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index e34de18e3283..930a7e686f8f 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -18,7 +18,7 @@ let postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; }; synfig = stdenv.mkDerivation rec { @@ -38,9 +38,9 @@ let "--with-boost-libdir=${boost.out}/lib" ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; buildInputs = [ - ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango - pkgconfig autoreconfHook + ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango ]; meta.broken = true; @@ -101,10 +101,11 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; + nativeBuildInputs = [ pkgconfig autoreconfHook gettext ]; buildInputs = [ - ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig autoreconfHook which defaultIconTheme + ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool + libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 + synfig which defaultIconTheme ]; postInstall = '' diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 999314429452..a15ffee3d4a8 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: +{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: stdenv.mkDerivation rec { name = "xzgv-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; - sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; + sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; - buildInputs = [ gtk2 pkgconfig texinfo ]; - patches = [ ./fix-linker-paths.patch ]; + nativeBuildInputs = [ pkgconfig texinfo ]; + buildInputs = [ gtk2 libexif ]; postPatch = '' substituteInPlace config.mk \ --replace /usr/local $out - substituteInPlace config.mk \ - --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall" substituteInPlace Makefile \ --replace "all: src man" "all: src man info" ''; + preInstall = '' + mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} + ''; meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/xzgv/; description = "Picture viewer for X with a thumbnail-based selector"; diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch deleted file mode 100644 index c5b1ae0879b5..000000000000 --- a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52 ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,8 +9,10 @@ - # This gets definitions for CC, CFLAGS, BINDIR etc. - include ../config.mk - --CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` --LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` -+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ -+ `pkg-config --cflags x11` -+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \ -+ `pkg-config --libs x11` -lm - - all: xzgv - -@@ -23,7 +25,7 @@ - backend.o - - xzgv: $(OBJS) -- $(CC) $(LDFLAGS) -o xzgv $(OBJS) -+ $(CC) -o xzgv $(OBJS) $(LDFLAGS) - - installdirs: - /bin/sh ../mkinstalldirs $(BINDIR) diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index e06b76e35b12..1af165368363 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; - buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image libjpeg libpng libtiff ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 350a64ba3e41..f1d84a919724 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + ]; + buildInputs = [ - pkgconfig cmake + cmake poppler pcre libxkbcommon epoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; - nativeBuildInputs = [ - wrapGAppsHook - ]; - patches = [ (fetchpatch { url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 3294d18e70b8..cfd4d6b32de3 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 78ac55088a4c..f4547c69dc4a 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -24,8 +24,8 @@ in mkPythonDerivation { # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook swig qt4 diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 05c058f8a83e..e48b32a783d7 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { inherit sha256 rev; }; - buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libxml2 exiv2 imagemagick ]; installPhase = '' mkdir $out/{bin,share} -p diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index d4884bb1709e..acd38d74dca4 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk + autoconf automake libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 67d37489feb0..673ecdc85496 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20170311"; + version = "20170714"; src = fetchurl { url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj"; + sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 06ebaa7c12dd..d9ea487a83bb 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index c7a76ef00a6a..28f14cc1435f 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz"; }; - buildInputs = [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; meta = { description = "Simulates the falling characters theme from The Matrix movie"; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 1e024a16e81c..0ee52b740f24 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" ''; - buildInputs = [ unzip gtk3 pkgconfig vala cmake vte gee wnck gettext libsecret json_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ]; meta = { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 4b81bfd53f50..1e5bf8a48edd 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f"; }; - buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl libX11 libjpeg libpng libtiff librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 6344f40a2911..98b47990314d 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; }; - buildInputs = [ libX11 libXext libXaw pkgconfig imlib2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXaw imlib2 ]; propagatedBuildInputs = [ libast ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 10605b8b18da..73911bab6f66 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "evtest-1.33"; - buildInputs = [ autoreconfHook pkgconfig libxml2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxml2 ]; src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 1097780723ec..7bd876f1d4aa 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,29 +1,34 @@ { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, - xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: + xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: +with stdenv.lib; stdenv.mkDerivation rec { - rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed"; - build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}"; + rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; + build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8"; + sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre ]; + buildInputs = [ wxGTK30 glib pcre ] + ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = '' - echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh - - substituteInPlace far2l/bootstrap/open.sh \ + postPatch = optionalString stdenv.isLinux '' + substituteInPlace far2l/bootstrap/open.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' + '' + optionalString stdenv.isDarwin '' + substituteInPlace far2l/CMakeLists.txt \ + --replace "-framework System" -lSystem + '' + '' + echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ @@ -62,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "An orthodox file manager"; homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 6cfd1e05279e..80f76bc27c89 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation { sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig bzip2 curl expat fribidi libunibreak + bzip2 curl expat fribidi libunibreak qt4 sqlite zlib ]; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 548679e4b47c..db78f2ec9204 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { }; patches = [ ./use-nix-profiles.patch ]; - buildInputs = [ pkgconfig gtk2 keybinder ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 keybinder ]; preConfigure = '' export PREFIX=$out diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 301695885016..4e786bfb36f8 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index db954a254630..b97b079ab663 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; - buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index cef8640d958f..b6bb3c2fd83d 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' ''; - buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext libintlOrEmpty ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 3be2704896ed..053da375ab15 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; - buildInputs = [ glib gtk2 pkgconfig popt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 popt ]; doCheck = true; diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix index eda95bc0c5e7..a67a8a44fced 100644 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ b/pkgs/applications/misc/gnuradio-ais/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix index a47925cab90d..bbdc74510eaa 100644 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ b/pkgs/applications/misc/gnuradio-gsm/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix index 6298e083617f..cd3630c842c3 100644 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ b/pkgs/applications/misc/gnuradio-nacl/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit + cmake boost gnuradio uhd makeWrapper libsodium cppunit ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index 5fc6eb2c2744..e2d3e808476e 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf + cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix index 5e729a75557e..3d09441a7f03 100644 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ b/pkgs/applications/misc/gnuradio-rds/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig boost gnuradio makeWrapper + cmake boost gnuradio makeWrapper ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index bd951c2a9a76..0156122ec79a 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation rec { sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 + cmake git boost cppunit fftw python swig2 orc lxml qt4 qwt alsaLib SDL libusb1 uhd gsl makeWrapper ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 278c685b7cf7..f552a74f4c11 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -9,13 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw"; }; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools + qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; - nativeBuildInputs = [ qmake ]; - qmakeFlags = [ "CONFIG+=zim_support" ]; meta = { diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix new file mode 100644 index 000000000000..026457fb8571 --- /dev/null +++ b/pkgs/applications/misc/googler/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchFromGitHub, python}: + +stdenv.mkDerivation rec { + version = "3.3"; + name = "googler-${version}"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "googler"; + rev = "v${version}"; + sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43"; + }; + + propagatedBuildInputs = [ python ]; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/jarun/googler; + description = "Google Search, Google Site Search, Google News from the terminal"; + license = licenses.gpl3; + maintainers = with maintainers; [ koral ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 230e0ff74142..6fa11667cf33 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libgphoto2 fuse pkgconfig glib libtool + libgphoto2 fuse glib libtool ]; meta = { diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index a0672f1810fb..27bda1e20928 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im"; + sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 4dcb5be8a21d..8b66b23df01a 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl, gtk3, pythonPackages, intltool, - pango, gsettings_desktop_schemas }: +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, + pango, gsettings_desktop_schemas, +# Optional packages: + enableOSM ? true, osm-gps-map + }: let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "4.1.1"; + version = "4.2.6"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ]; + buildInputs = [ intltool gtk3 ] + # Map support + ++ stdenv.lib.optional enableOSM osm-gps-map + ; # Currently broken doCheck = false; - src = fetchurl { - url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz"; - sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; + src = fetchFromGitHub { + owner = "gramps-project"; + repo = "gramps"; + rev = "v${version}"; + sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1"; }; - pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 623cb12f9323..00421a2e0334 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler gdk_pixbuf SDL gtk2 ]; patches = [ ./gdk-libs.patch diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 85d95c7b3f92..cb407fca66cb 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; }; - buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 9115fe026daa..7f3b3a8d6dc5 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig automake autoconf gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf gtk3 ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index ea3f4b8f2b92..347d76860ef1 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; - buildInputs = [ stdenv pkgconfig gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv gtk ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 08ae34f97055..a61d532f1f8e 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gnome3.gtk texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 1132f6b12f9b..f581b302c3f4 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 + xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 libglade GConf pcre ]; diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index 1b8257ca5e59..6186ed6f8f41 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig libusb fftwSinglePrec + cmake libusb fftwSinglePrec ]; cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 5097496d3992..e2232c4b2ec8 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/pkgs/applications/misc/inspectrum/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cmake qt5.qtbase fftwFloat diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 8952b7edba4e..38eba46138ef 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12712"; + version = "12921"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; + sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 587e6a588a73..015ef8760648 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -2,7 +2,7 @@ , zlib, libpng , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf +, enableMuPDF ? true, mupdf , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes @@ -51,7 +51,19 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; }) + + (fetchpatch { + name = "mupdf-1.10a-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; + sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; + }) ]; + + # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + ''; }); leptonica_modded = leptonica.overrideAttrs (attrs: { prePatch = '' @@ -75,8 +87,8 @@ stdenv.mkDerivation rec { [ zlib libpng ] ++ optional enableGSL gsl ++ optional enableGhostScript ghostscript ++ - optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++ - optionals enableJPEG2K [ jasper ] ++ + optional enableMuPDF mupdf_modded ++ + optional enableJPEG2K jasper ++ optional enableDJVU djvulibre ++ optional enableGOCR gocr ++ optionals enableTesseract [ leptonica_modded tesseract_modded ]; diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch index a393e30fc726..cf7e4896b803 100644 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -17,11 +17,11 @@ index 4a2378b..502c477 100644 -# willus.h -# HAVE_GSL_LIB +pkg_check_modules(GSL gsl) -+if(MUPDF_FOUND) ++if(GSL_FOUND) + set(HAVE_GSL_LIB 1) + include_directories(SYSTEM ${GSL_INCLUDEDIR}) + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(MUPDF_FOUND) ++endif(GSL_FOUND) # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) @@ -30,7 +30,7 @@ index 4a2378b..502c477 100644 message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} - -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz ++ ) endif(MUPDF_FOUND) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6ae86486b47b..5de202f8f731 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; + sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94"; }; cmakeFlags = [ diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index c5b75a0be555..8479c4e16ace 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -62,8 +62,9 @@ stdenv.mkDerivation rec { sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - zip pkgconfig python zlib xapian which icu libmicrohttpd + zip python zlib xapian which icu libmicrohttpd lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml ]; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index b78a226b6145..9018a5926424 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cmake boost portmidi sqlite freetype libpng pngpp zlib diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 7a0eadf74e5a..47bcbb6fce91 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - autoreconfHook pcsclite pkgconfig + pcsclite ]; preConfigure = '' diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index f6bfe61e5aa2..7b5b40d65a36 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libX11 libxcb cairo gtk2 pango python27 python3 + libX11 libxcb cairo gtk2 pango python27 python3 ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 2fa4ba9ae644..3729978dddb0 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { inherit (stuff) src version; - buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool gettext gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 5450f5f2fc84..4972aa28e589 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; }; - buildInputs = [ libusb1 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 964617e20f1e..0c08929417e6 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig qtbase qtsvg python file/*for libmagic*/ bc + qtbase qtsvg python file/*for libmagic*/ bc hunspell makeWrapper # enchant ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 9f98376a51bc..d8d1cff6040b 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { cp bin/milu $out/bin ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib unzip clang diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9fe275b490c1..61febf5a7ff0 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig -, freetype, harfbuzz, openjpeg, jbig2dec +, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg , enableX11 ? true, libX11, libXext , enableCurl ? true, curl, openssl }: @@ -26,11 +26,17 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614"; sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc"; }) + + (fetchpatch { + name = "mupdf-1.11-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; + sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; + }) ]; makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ] ++ lib.optionals enableX11 [ libX11 libXext ] ++ lib.optionals enableCurl [ curl openssl ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -41,13 +47,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/lib/*.a; do - so="''${i%.a}.so" - gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive - ln -s $so.${version} $so - rm $i - done - mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF prefix=$out diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 9ab12367903c..e8c6c9f24300 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -20,7 +20,8 @@ in stdenv.mkDerivation rec { sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; }; - buildInputs = [ cmake pkgconfig gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index 55cd17c2c0b5..1b800f654340 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq"; }; - buildInputs = [ pkgconfig libpng openssl curl gtk2 check libxml2 libidn perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL buildsystem nsgenbind diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 536dbbe80d32..02bb593ce710 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf"; }; - buildInputs = [ pkgconfig perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl buildsystem libwapcaplet libparserutils diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index 71445fd17a0c..50a6dadadb5c 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a"; }; - buildInputs = [ pkgconfig expat + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat buildsystem libparserutils libwapcaplet diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index 3e9210589ea9..715196871512 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86"; }; - buildInputs = [ pkgconfig perl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl buildsystem libparserutils ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index 040f1c558839..7e99f8f5b86a 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy"; }; - buildInputs = [ pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index c627a769bbb5..24235f43a114 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl"; }; - buildInputs = [ pkgconfig buildsystem SDL ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem SDL ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index a834d77c8eb1..836bfd5f3e0a 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index a18f91ba2647..1e8dbe271370 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index 63052e080a5a..a905f3a12a8f 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq"; }; - buildInputs = [ buildsystem pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ buildsystem]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index dfeae77d343b..2aa04ce83e53 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib libwnck3 libnotify dbus_glib makeWrapper + glib libwnck3 libnotify dbus_glib makeWrapper gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 7c8eab9f11e8..507b4f2cab9f 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -91,6 +91,8 @@ in pythonPackages.buildPythonApplication rec { -e 's,psutil>=[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ -e 's,future>=[^"]*,future,g' \ + -e 's,pyserial>=[^"]*,pyserial,g' \ + -e 's,semantic_version>=[^"]*,semantic_version,g' \ setup.py ''; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 000af950bf12..8ff9a2f44d55 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - buildInputs = [ pkgconfig glib gtk2 menu-cache ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 056649ad3d26..3420d6365b4b 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3"; }; - buildInputs = [ pkgconfig cmake gtk2 wxGTK30 libpulseaudio curl gettext + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext glib portaudio ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 65366607c50c..060d4899f4c7 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; }; - buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; preConfigure = '' ./autogen.sh @@ -17,7 +18,7 @@ stdenv.mkDerivation { homepage = http://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; - maintainers = [ maintainers.mingchuan ]; + maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index ba4a57a191c3..691f3188b08c 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 86dbfc0c5fe1..6d0a348b1f76 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; - buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gettext texinfo ncurses readline ]; configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 0cd0d29e2f3a..1347840ee674 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake unzip libXpm fltk13 freeimage ]; unpackPhase = '' unzip $src -d posterazor diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 5cbf94114357..e3e7ff950b0c 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -10,13 +10,14 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript + qt4 poppler_qt4 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index bed1d1fc97c4..f77220534014 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 synergy ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 8bbfbaf7cf0e..59d22b967b57 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -24,10 +24,9 @@ stdenv.mkDerivation rec { sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; }; - nativeBuildInputs = [ qmake ]; - + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats + libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtquick1 qtquickcontrols qtsvg qttools ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 03d058783b23..8b93dd51406b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -9,14 +9,14 @@ let } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89"; + sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.9.11.1285"; + name = "rescuetime-2.9.11.1300"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 3c4cf27308bb..c5f4095e59a0 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo git + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxkbcommon pango cairo git libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; doCheck = true; diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index fb6e9e86e599..652dd9d5e650 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6"; }; - buildInputs = [ cmake pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libusb1 ]; # TODO: get these fixes upstream: # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index e8914b75b8a5..8e63cdb6d16c 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - buildInputs = [ pkgconfig libtool libX11 libXt libXpm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool libX11 libXt libXpm ]; configurePhase = '' LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 1ed6e4d70c93..c093a7516031 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; }; - buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ yacc ncurses libxml2 libzip libxls ]; buildPhase = '' cd src diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index f808ec611a33..a538e53276bd 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ] else [ ./sdcv.cpp.patch ] ); - buildInputs = [ pkgconfig glib gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gettext ]; preBuild = '' sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index f4e1eef28363..5fffa6681cb2 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig + gtk3 udev desktop_file_utils shared_mime_info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 16d6ca2e26fa..f44ed8a1a3ef 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index ab890c8db718..69794b1cffbd 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ]; NIX_LDFLAGS = "-lfontconfig"; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 05e34cc5c305..877990861fd7 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; }; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index e7d2a595684b..2533014c5607 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist + intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist vala_0_23 hicolor_icon_theme ]; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index f9d1039a292e..f16a0d29c40d 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -15,7 +15,8 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ pkgconfig libappindicator-gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libappindicator-gtk3 ]; meta = with stdenv.lib; { description = "Simple application tray for syncthing"; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 584b8f6a2966..bde30d9041ae 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516"; }; - buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index a64ab0ea2ca3..7378950b189b 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; }; - buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gettext confuse vte gtk makeWrapper ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 6a613b6d5b5b..e77acedac086 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "15.1"; + version = "15.2"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "16mpvknibbqy0vjgkwig7g8i6rivm14ipd7ixvqydgcj7wibn0b7"; + sha256 = "1lfk3zcgmmlby353gs70gpi0m28nx2c20wxqgaw7268a69r5cz7a"; }; enableParallelBuilding = true; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/o9000/tint2; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index 357713df3845..ba6e97d61fb3 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; - buildInputs = [ itstool intltool pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ itstool intltool libxml2 gnome2.GConf atk gtk2 mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 makeWrapper ]; diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch new file mode 100644 index 000000000000..5eed93834632 --- /dev/null +++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch @@ -0,0 +1,12 @@ +diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt +--- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400 ++++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400 +@@ -54,7 +54,7 @@ + if(NOT APPLE AND NOT WIN32) + set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") + set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) +-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) ++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) + install(FILES config.xml DESTINATION share/TrustedQSL) + install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) + endif() diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix new file mode 100644 index 000000000000..829ed2585627 --- /dev/null +++ b/pkgs/applications/misc/tqsl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: + +let + lib_suffix = + if stdenv.system == "x86_64-linux" then + "64" + else + ""; +in +stdenv.mkDerivation rec { + name = "tqsl-${version}"; + version = "2.3.1"; + + src = fetchurl { + url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; + sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + cmake + expat + openssl + zlib + db + curl + wxGTK + ]; + + patches = [ ./cmake_lib_path.patch ]; + + meta = with stdenv.lib; { + description = "Software for using the ARRL Logbook of the World"; + homepage = https://lotw.arrl.org/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.dpflug ]; + }; +} diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 4787516cedd0..9df2a2dde765 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -85,7 +85,8 @@ stdenv.mkDerivation { sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; }; - buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse devicemapper wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 9a4b795061b5..3cc4fcc1517b 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; - buildInputs = [ intltool glib pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib udev ]; configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" # do not set setuid bit in nix store diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index f745bf3ad601..0a651906cd8f 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; - buildInputs = [ ncurses autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses ]; preAutoreconf = '' touch NEWS diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix index 00a60ae50a48..f780e5469d02 100644 --- a/pkgs/applications/misc/valauncher/default.nix +++ b/pkgs/applications/misc/valauncher/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi"; }; - buildInputs = [ cmake gtk3 vala pkgconfig gnome3.libgee ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake gtk3 vala gnome3.libgee ]; meta = with stdenv.lib; { description = "A fast dmenu-like gtk3 application launcher"; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 1e7c7f654b5f..7f4adeb2be87 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; }; - buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 8e1514583a25..e06242f7a024 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig qt4 qmake4Hook ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 qmake4Hook ]; meta = with stdenv.lib; { description = "A mind-mapping software"; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 32daf108c1ca..bb18da4d4ada 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; - buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ] ++ stdenv.lib.optionals gtkSupport [ gtk2 ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index ad642ecec5ee..bf1fdbb9a8a8 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 15d054c2be2a..7d22a1605740 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"; }; - buildInputs = [libX11 makeWrapper pkgconfig libXaw]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libX11 makeWrapper libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index ecd6ab8c2add..54d61a047a78 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f"; }; - buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index b3a57e1cef21..3e8acff00f89 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -14,9 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; }; - nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_gfx flex bison ]; + nativeBuildInputs = [ pkgconfig flex bison ]; - buildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index dd3903cde271..bd891ff8493f 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # TODO zaptel ? postgres ? - buildInputs = [ qt4 openssl autoconf automake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 openssl autoconf automake ]; # /dev/null is used when linking which is a impure path for the wrapper preConfigure = diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index a646cd10b6df..8a460f890167 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { icon = ./icon.xpm; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig file gtk girara + file gtk girara gettext makeWrapper sqlite glib ] ++ optional synctexSupport texlive.bin.core; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 2e644453dcb9..34508da0e371 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"; }; - buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ djvulibre gettext zathura_core gtk girara ]; patches = [ ./gtkflags.patch ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 23a654b4d510..c9472f356672 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; }; - buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 4912489d6b35..2dda88f409b5 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"; }; - buildInputs = [ pkgconfig poppler zathura_core girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler zathura_core girara ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 89d8d5badb0a..a415cde3c7ee 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; }; - buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libspectre gettext zathura_core gtk girara ]; patches = [ ./gtkflags.patch ]; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 0aacbd2565b9..137b463a1e1d 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq"; }; - buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix new file mode 100644 index 000000000000..715fefe17d83 --- /dev/null +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: + +stdenv.mkDerivation rec { + # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a + # release but it is basically 2.1.2 with the falkon name + name = "falkon-${version}.1"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "falkon"; + rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; + sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + }; + + preConfigure = '' + export NONBLOCK_JS_DIALOGS=true + export KDE_INTEGRATION=true + export GNOME_INTEGRATION=false + export FALKON_PREFIX=$out + ''; + + dontUseCmakeConfigure = true; + + buildInputs = [ + libpthreadstubs libxcb libXdmcp + kwallet + qtsvg qtwebengine qtx11extras + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QtWebEngine based cross-platform web browser"; + homepage = https://community.kde.org/Incubator/Projects/Falkon; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 79f56413f4cf..e8b84c7ee9dc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0b5"; + version = "57.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb"; + sha512 = "3c6a528013d0fd7f002990a095e1b1c3e1e01f82444d2a53f73544c4ad4e0aad62e49af561f90b8d0fd983e7f3e515e57f14e8b9c01ed625eb90db348d5f6b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c"; + sha512 = "f8ef0a994e3ad04a02f86f381020be2087674f56ca747be529bbf6bcfab03da221305767a1b056240524e473a986ac7987485bd3a94a21d2030e561eb16fd1ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d"; + sha512 = "4df60570c8c7352fa1e9a0520c795947db6f03a7c757a8a554b2072fefb36bc2636c15ae58fc7bb28ec5e8aa471fda26c91c7e8aec06013407419e9522144c9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78"; + sha512 = "8908830c2bf333d6d008cb900b97132abe26d84c4cbd4e0d281ce2d4cb211eab4241139836e5b39bcb8f48012254d8d5a06b227b1ecbdadc6539899bce1326f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c"; + sha512 = "28773583524bb22de708ddd9341192b631674b644ec639122661c25feaba70ccacdcbd77efed9997e490ccf59882fa9f5f5f3010a62f361fda2808ca73061276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f"; + sha512 = "7510a259f3ef4bcc38163b7ccf2f090cd4a4cad1133bd2d961470116d0f0bb34d41087a40d744cd31207afab1f5299049558657d02f4f0f23a3c99a98d752624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7"; + sha512 = "8282183bc02bd7d4bad0cd9d74956634dc0db8988245caf1eb89f16d596d78a6ec00739065b38cb399dc93b113d35eef5cf1188a2a9c78256d002cfeb87114d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043"; + sha512 = "6440aa65e05ddbddf4629051be4b05bbb030317c241fe51de08d8d11c003fc094808a532192651d874b6ad7e6d8f89aab66485442839b34df22189fa89ee8efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e"; + sha512 = "9489b8125e992f213c06583e6b4205d9195091824ff39b5b171896be2766c834261f648c34edc992da72bf1c4609e92224a119402913b4e8298edbe94159a860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7"; + sha512 = "22db87e53116fc8db9b2c917dcd2416f0a14e19eef5834ce58cc141a4123b51e97e9d29f222c341f30180905e9e261d1f634579d8efde4db221ea78fa82cae32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6"; + sha512 = "91800665d44a074cdd56333722ce3d1da54c4df40a9a964f63ff6153bd077e452008097f6bd678635d2ea16e30491ed960f60a473d7f95fa2ad35c9e717e6bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd"; + sha512 = "b95dba3b94b48d63b1954ac4983bb6d736777630899c60a84dce07d3f55843c23bb7af7215eee081cb3432c705700dc4e4df3665b329d0e5cd9e691e7da9bfe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f"; + sha512 = "cc656b07f6cd1a2783fae5e09e9ba4e0abd3ba3b29649e8d496511564075a8dc442206b8f2955aa0f5ddf36329c6b184278204e9398eda210b51774091341be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51"; + sha512 = "c61f7f062989d10372bb79664ee94d5ae59e89ddd69d5eebaa3da7c3c639ba7c50a3f9608144e76a40befdda32c87ba5d32e14eaa0b98130fbf7d6b8ffdecad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c"; + sha512 = "f2b5db704e668fe3e8e97aacea1663a2849eec0ea527b5107927c5710d95bc8a8d89f73a23f53b430fd24cd19b5c7c0e4a6ae34d71aabfa87b5a743e760dc0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128"; + sha512 = "104f7498bcde823ea1f28e79e2be25acfefc5f9cd4755ef5332f160e15a63ba54ccb713a69c694027f2e99ce0e1b7ab07134c6bcc8a4d3caf8b10241ae27d3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba"; + sha512 = "dbf802eaca0fb11a5453cbbea4f050ae7fcc5081712cd9fcf3ce9b04a1e042dd4bc1ca721d82abafe26b9d6cb5bbea41ff6b58252bd52651ea5fbca580cad479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd"; + sha512 = "4dad1125de1f8010b3b30fd1ec84e26317046d5579c7841bf3bde480c059f088ca3dcf6e2b4a7843f1cd086798e28dcc95a6dfbf533919f456e2d6af062279e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89"; + sha512 = "dcba94836bc0f0409992e33d65814cca86811bb6ba6695a082a8b109ff153a0d12e36b6d2ad2d62ee9b588a68315f40420efa7c2b70ee667900fba470f01cdba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9"; + sha512 = "4bcc69f67901776a153f7b2bdd22d3dc7c23246a616095579008d4c2c2798ec09985488ae0c870e2c794aa553b687e95a56f262f9a5568b1712e04ef3dc884b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5"; + sha512 = "2cd4d4ebc3099761a4f3aac6edebd662b4e4397e276e2fa1afa8b0acf6ff2d9367ff7f27909350b5ad8bda3a309a73d46375d46fe8c986b35c209859b79da4fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c"; + sha512 = "86812a5b80bbe2845f628e9b02cfa037077f9a9bd39e292dbe8857437498ef48dd5576ff98f70765ce342faa55459c0df7ec57810c4491c5fcf1f874c02f6382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb"; + sha512 = "27d107999a86f31451ef4086d62a6449088619625b46c599869564cf0bd4484ba13c92c8a368afa1111039a81c01f8f49cc3a270680822638f8c73c3d088683b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156"; + sha512 = "0fa620dfc562e187fe799251d98c7caaec3021f5317f4bb31a78ffd9fd9501461d17cd66e0d47080e91cc2fa7247c1a1de8731896ad0daa8f891585d894a294c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf"; + sha512 = "3a07022582140f4a25992c5e0e93ae2d0f695c5a258a98c6f2b1d3edee41248b9eee3e655084d61b21a7c32b29dc03f4bbf5e605365a2d077d9b5ca069cbc2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1"; + sha512 = "bb5f9b65b6d92654761d99911afa9d10dd1adb2a80140f6c1beaf5e014cf46929512af716c1fc8c01bc7f13baa5b924252a11a71b916d3945c1d28ce52686019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96"; + sha512 = "6f7df550a90d2d8fa9b8417ae4bcad8158b544c3a49f240a0be4b0bdd350b92ba1c7cf99edddfda85d4d702693f52dce2ef053ef985001b5cd0899302087b21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525"; + sha512 = "d472091717f237a163db30be066589bcc1c0b2b72aee751dbad0e47557fc92075c29b2c65336961fbd91e3292307be0366a89220888f3ddf966a29ec1f2c765a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c"; + sha512 = "ebf9eebe47cdec6ec2beae0d6edf48295089c7ee5aa1ead26e0ddb45fef583aa5be3941c4bf4c27b4fd7504f141a34342f674c6e15beb086f6994e8e3fe45ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db"; + sha512 = "818c7c4cd486988496f50d5c5a4a56a12ac8538113549433f11aeeb33242d7337f144413e27920cdf2029fcdbc9a2b9a47a9dc7d92fd67f2066ec5b742b6c625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b"; + sha512 = "781df02d0977a9e50ff01e214e2ba3bda27fc9052119d0b03989304d2db13009583e7d6fe32a9d502eaff1abbfb81c55658c3682e4f59c6da78ab16b59e3bcbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439"; + sha512 = "8e10c6d61d145a1dce790dc55691091b514749fd7565c41d1f5aec6a863814fa5a7b4d012068682dead8f87e4c1813787bc724438018393f5989f9dc49a1275c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0"; + sha512 = "1429a4d627e655edc245c375cff00e39b4cc42176e1141e49e9bf5eb2a9564de88a0915795bb94dc842d44e0de1aea28601c30fbe14bee0b210e15384c958c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd"; + sha512 = "65e1034b856a51dd6e21a7c21436a7f2ebd6794d6eea8f0631161feed5c06c34725e99473bfe9d169ef963632cd4aae72ceba24b658369f3da6f1f34017baf1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e"; + sha512 = "9369f1ada09541a46745d66722884b3eae920f79673763cdce587a56d36515d6a9c799775791d587dbe5cb33d683b87194996134cf530d20bd3509d09f62546f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b"; + sha512 = "e765ec0dee9ae728274c594906dc57124582006f0d2c1bcb671d2d85812a5656ee99955f00d262095664b9bfce9e664c62f2b8dd61cf08fa4e460f68b8b6da69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b"; + sha512 = "32e409050d2d45cf2d8eefc7c55c62c89c4e510b7d69806ccd3b8dcd7b68f58abc75eaeecc7c899fce832daaa3954acafb1d7e35d1e70f62a10f78dd4dfb7712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d"; + sha512 = "5b2418a12844bbf5943e57891a31ac7f95bc214a4708fdaccde772890bab94be88251cdb4a13b031623c396767e6386b5741f9bb46a6878ea28c380f91a28963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8"; + sha512 = "e45193079948904b1900bcde30128aa8e1aa29d7ca70269dd1ad73e55d9dc7a1f6b18d9c31a6b93fd13c84ecc7d8f6c474e41831434cf3455783597857f4cb34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae"; + sha512 = "e062ae0ce3458bf95cfa37ba439d7da7f19d612240f9a23363cfe0724d264c48ec50826e4ef959fa22d7a211e964a9dca8eb23281fddc8069af267b015c9ad20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0"; + sha512 = "42e641fa032601903d34652996c08c6e74b1bb44bb2b579a20edcd064dc668739b4e4b8b973d571cd3ee5818bc99667e5f8114d8744de0043141c205c6ad320f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d"; + sha512 = "1303b9dea95512a85112097a2b1871d6415acb2134bc538e27fdbf5af005f3ea5da58c813aa2d02242636bb1211943dcb8c62f47593b9cd2846c26d0f8f93d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9"; + sha512 = "d8300d7678b5989884bce54fd7969c758eae4c7503aa25855279a3a24c3fe3c95097e4aee2a4e29c86e53c833be973571fa496290754d7da001cc6712fa11d2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70"; + sha512 = "f6b7ef155300dd782ff5acd35202e42c64eac06d1eb623e3fddcfe60bdddd098649e477c7260d22f787591a54486ccae54d915ecb20ab114f05f88305bd4e099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d"; + sha512 = "00e30546e596c8d2c06f57de0125e7f366356e4ecd4ec4c499120e459492b45965fe95ee9698e98bcb1272249b0c99240765f5b2cc98099403585b644add4a04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1"; + sha512 = "6fa2b613d550edc2ce3328b020d868474e1a523b6aefdbe94a84b7d38800a81abea2ce177217aef88703672293ae2083ed7b0f278265b83430f8f2bc6c3aeacb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666"; + sha512 = "14d31727a1ad12438ea4883c15c073bd76a4158a5eba874530068afef9e1f2ce017ff0733eaaaa27f1296b00276aab3875129ce01aaf98a148df6677875f3954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89"; + sha512 = "aa8d47e406e391111958419b45bf88150dcb945d2f3dbcad901a641e1c2008eb25538c987ca3c8ea3b55c8c62c3adba7987c0cedd997cefd8ccd74e77c3e9a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6"; + sha512 = "18c714e424abb23d48e449a58ff883414e5426c1c8a0f1e54f3f0f0eb4759e94f33facc6d919299c2fe5f4db62bf6daba166576debdfea6be1456b5749494e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea"; + sha512 = "2da3a75200238e35a69622585da79cf31379e9a3386388c087a7706b6deae76db56ca0eb6f63d02689c79fa8cb8ec9a08dd3c304c203c5de64a8da3401f25a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6"; + sha512 = "5656c13478d3bdfc8fa0d1e01335f1d6c49bcd3ddd85a5a786b97418adaaa1a64632b7b8c1e5a6cc72431dbf128e4e3d81508fbc5fa6cb0d79f2f79b58778bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f"; + sha512 = "1a8b488bfa87ef950453c9479943e41fdbe8c26051d68af06d341c0a555e84abf390b50d16b8a99b0d3799182a5781c4808bfece4e055e0b3a834f9b81a4c416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513"; + sha512 = "23ef286dcb57f552268aeb5ca01368bb6f5541812a0cfae1e88161b522b3097e86be3ad93a26f51618dd818f6a6014eb96352f75a952de5aa76f7a94d9a466e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75"; + sha512 = "f2324279d127b6a626114edb1f947e45073ee99751c960bba06cb02dc71ef2e32554be8d85756c7f76947dbab0af00969222b0bf25d896562e4e0d8ee832b959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb"; + sha512 = "2a4a1b22e6d3aeb61e1a3e7446feff92fb85873862f02d4b201952c99dddf67fcab219e69681df29429d6603468c83ded93af90fee938b5eefe8fc2cc58d17bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59"; + sha512 = "ab1a4fd00b09dc73c971be1cca674408f5474ea7da77b4da8fb692c046a0ecb69743912ad47313efdd6ea9338e338f4093904e42cda125f67be13f281e7841f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311"; + sha512 = "76482e0199dfde34f0fbd5a32ea79875285331a65f1270246bf8b413dc72f07b8bfea7b6a721005189107c8f2baf54f5b4c2aa5e9008e7ab70ca5c5f3bf2656a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40"; + sha512 = "bdc30b4a4ce2fb4a4f0a761066ea17cd30fe0d4c682f7b5ae4a4a9d6f220e9aca7a918f69a2fbca85adec8eb95d4c5c664e8958caa73d57d79152549f03e4bff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24"; + sha512 = "afcb9b001e0751530d179dd3f797240d72a31a51263ff91b8ba055a90b474958b62cf7a7142ff43a84e2d7c3388feefc13232f818a96d82bf58d6d2a39c52db1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c"; + sha512 = "75c712b5df622308e113ec2dc04d513b911f15d180ceff0439b2bef9304c9ff359ecb895945b5328579906eb5d0e2fff6f1fa2698a085d104ecdb19d06727341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf"; + sha512 = "e2e0654d8f43062fb173dc4782b83641c2e9a5d5aeff4e0bfa38293956f321d7410eb9c5e2a5e17992d6895575fe5f1c94956cb67ad6a4571673a093b44b84bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300"; + sha512 = "7eb2cec4b09a6204986c6a71333d5b08802617a0ee29f1bbca52c8a268c27456904e518128d15f74fcec0cdb040f5696c365669d0a8f1653740cfb2a25815161"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218"; + sha512 = "cb7f5fa2d2b1650ec24969c25fb2d42dcf2f478b2f7a4ff48aa2afd2a08b07ca2fde842c830bee2c3f6de588fd83c3970ca965dc62677400c43beca6472fdfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a"; + sha512 = "b67631b0ac97123053b5e941df3b833ae3881b8a37d1c25e18ca962a04f2a600ee23257561a5a7b69bd37948b480cbe75b610313d67f1a3ea0c64b36ccb1b0d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291"; + sha512 = "614fb7f03b2fca659575600c2d7bceee35e4066f0c16cd3d88364b2b4c36fc6261161d5ece691ae8230767d5af4302d84d6e24ecc2786ef7f500547c8d039850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050"; + sha512 = "e568525fa0151e5188a325d695fad47af3e2f59b15ce4075d27c6e6b16b387e86cd94d03dd5207c675cb0f7a4fa95d3f7e67248876391259d858277cb5ab339e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358"; + sha512 = "a7008a0e2da4d0a273d0fa9b9a7fb1c873570227536600820df353deab63b7fd3eca438e0647e73a9e93207fdd66513c051e91949f83f6af4a064f50392eef27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd"; + sha512 = "380d4d0381cbcd9eeab57a1eb0d7b90a73d0c163c825033d3f7c65412ac418a7dcdc07ec0a10131035f4d02a9ce37133b4514ef953dc5bdac3f0d415149b4364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3"; + sha512 = "60d9157c1add1064b9f5d3d0873a36fa7a29f9f19da6b0da83385db86798ea645ca98162a63a43f4eaafa8b79a8c19cc2e547e08b3c06da8c36c077993fa8faf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f"; + sha512 = "0ab3abff83d0d992c929ead73e2a2de174475b386559395a2256d40e7ce8c4c6bd48d59bd2f3e343b12c2c31c2fe2febe5c4baf658fb38a9dc4bce2106c8d159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0"; + sha512 = "29d743e8f90568a1f4f4a1e0988c9f5f598dceb589ea4a6366d9793c4e78e650c0c5f8caf0a30c5839d5226c0788c40e5e128c027554b33e33f883a65504ac6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0"; + sha512 = "7738550ad840a14871da75c913816f9c7d27dd5037c3a8a6ade0415094c28e2f1a00c6b92dace368284ffb0f859131f1894da3b0ba720442dfecd6ed67bd3b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547"; + sha512 = "0a738deb89fed9c4faecde5412bba4bba9c83829f31ad79253265fbcb7d5e479160729ba537935c2f88d29b987cb984f338dc6232489938d22333da49aedbec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480"; + sha512 = "d51ce8adfb710e8061abae49b47a580278936b819be2d438833ebdd81bfc1d7cf631acf13c4837ef3134be6b9dc31b5f08714d7f37271faa5116d3fd2d4c7937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668"; + sha512 = "bc2f9d3cb33474c330c637a8e5001d3fe427172ac9ecee4a9ed2f612cdf0f4e6e8213f5a4f01d964e8326b6ed713de5a6d4470fa87685487800f29485727ce8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c"; + sha512 = "66e25774ab24a48988bd8963d089c375f8bc48d73ca104bc83df36c1ee8da7d1c46831dce2539fd447e956a2378060999b53e60a9cd7dcf5dc780ae3aef21648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371"; + sha512 = "0b3548eaeadceb0f15dc0d9ff198feb2fe94be579be3ebb77026894a3dd6aef6c4be36b32cc0876795fece91ce96fd6233ab12bb85aac415e5368c8f00dd97fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103"; + sha512 = "a77772ce7197a9878cdd1f9fdfe9bedd21984bac5846a81ef9e1d08fa64da6bb8dbc80b758b0aceff58e3a97f0aa4446e9f82126430c56690a87363fb65b02f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31"; + sha512 = "a9ae3d06e954d07da9cb3312e0f567593952e9b8cd8597a42f5fbfa80009f8ff79f3bb502e2032402c62ba3dfd10887a7314406d25301e5c00ff653af5fa3046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00"; + sha512 = "6b63b681bffdfe6942ed11a1483c7072f5d8322a513a2a6a8caf45cafa3e8f1bd750ef9db3a48ceccc49ba281dcd57655805a483a52325d542607511afb1c6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67"; + sha512 = "121e67c39bbc546aa06f409cc62699a3c7f43307a11140c0ed57f5daa009be92e527fc5a8eccba7311fefe650baede394c0e0ecd01e2adecf783439536caec72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007"; + sha512 = "6e4db28b27bb6991faa10703b07dd251a53d9f30b27a9bb6f640c491a05059c6706f13363557d455d5529281d8797620272eda189da74c0f449d03bac8973b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4"; + sha512 = "eb2d92f3470e97f54b70fb12b87e2b0653664ea0f7a59e93f85a907564dc9619a639d6ce418e1ab90e8c40676e37463d9e4ecc29c07d810500186bc1c234e6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f"; + sha512 = "faad39482bc2ee50ab66ab8172097860cbdf7d5d81270bce700af8300896b4d30d1b9ff4737ca0841015058ff42fd1ff16db68672109e64edd67d6f0592add7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a"; + sha512 = "ac0cd929bfd9dd5e112077194601e1d70d40b86b0c8fb347be8edcd30b4d622974ea7580709f6502627f0cfb99eee465a615b9899e38d427181a567e47593e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6"; + sha512 = "7c45aa88117399629b0985d4f64e503c63e116e05acffcdad18c05cde84556d359834ea1c478a0585bcbd8838d23c1ca9ee117cb3fddd2957a10acfc243f5e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014"; + sha512 = "fae97f4b0dad5a0e474be35ebb9ff2195a94e5d11512697a41fa45cfe1f131816283107110f723de319f2d4e9bdb7a311e7d72cf02eb4eed325b10e7067f95e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e"; + sha512 = "a54215a44aec2972d55ec698b44144bed15174aceb445c0710b3e3e5cfb8539784e1ad6c98317a1f1a585f7601d33d28a4d65936ab9bae219ccf42c3d0e98a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40"; + sha512 = "10098291464cbd4e48caebdf9b95bb30f4df61a0cd5e617c6fb09b22cd0aa46eb214e3f2b19bce14c9bb703deedcd7b22fc2d25f780759c955a65d1bdacb2603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c"; + sha512 = "5d40e66225e097eac31889c1f5ffe8389ba3a3f159956cf6f0083ae40decd1141d306805cb51e79b69de84c73b84858121d40b0244b645efcae1b791cbc788ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2"; + sha512 = "d3a6e6310dfba8182cb529ef96c650a5344065be61569a56f310e23bc443c500af99d0e61092867c0ea94fbc65d63af2e94bb077dd8a5d0dbe1dca1aff1f6183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215"; + sha512 = "fc4a085b72e31a92d9ed708eb02b42d3bba1d2d747b50891e4fce5e1b24578ac0637eb46c6a99cae7d81911cb2d6987659465e1168beb4fb27a0e128cdc06d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9"; + sha512 = "57f6cf74ca703f00d29a5c1f11223728c6f9e06bd25696effa69b155820d839680f29033dee1294ee71a2a658f35482fa05c4840a812a8aec8c9b052882b8fbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d"; + sha512 = "52f2c50c3d65a2edaf033d313a4e2221c074cd76f1d89ccfd1101b9deb363fadf15acb9a795604c343e55ec11fa61705559d7f71134c71726b92801df348f677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7"; + sha512 = "0f22ee573b8ca0a041373c33588496d1717eeab134210dc9cc23c951fecdfd319a10ccca18329543f969445bf261bbecb1b6de6a1223101bd50af8a1244a9475"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632"; + sha512 = "0c474ecba92d8c6132a1bb484702db6f9cb34c9503babcc9f339cfbd97f03cbf6f9e51a4b7b7a69efa6cc9acffc648a0912d2ab92753d6e00ff9bc92667f263c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939"; + sha512 = "68e0875f2aa221d639067c2479cc949a6bec5a8097efdb20452b9c6c9ca1c781570405356775c05c02939f04ce4a4ff23a84ffc1eefd5c213a37d6ed7da64fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109"; + sha512 = "c5c95b2bb6822d80dbb83277d9efcc7e750581a7d46295257802c760dec6016dbd79c9d90767c2bc75842775ddb489b6cacdf3e7e66d63dc19f6c310fcbf0b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46"; + sha512 = "7a86badfad03dbb4198d2cdc287c502c54df2a8eab6be487211b3c4372b0d8d82104fdd136f84a3f6b265225f639b12f3b23f3378ac0fe185919cde202a9e542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3"; + sha512 = "1fde68d53458c0916f49be591c5bd744b7a3e3b4dcdbc0118ccfad103c357d5317e8d1fa7419cc1ffd48deee4ba196a2a41d9f8429c53be444fbcc5a8385bcf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522"; + sha512 = "721e9822c9638299ffdb39eafc1f2b485d862acfc6bb0ecb02563433fefa4a081845d31b75586984b1b7db768815dd5823a8ee8c0d22b655be13c15f3c840e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782"; + sha512 = "99afed4563ad52bb2573c66a974cd47688a5f951635cd28c85ce745d8b846473adf488ededc22d0737b6406e98c6f2de6c828434b9637e57f0b9973997241691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0"; + sha512 = "6e7e0306dfff0bdcc4af40a63c8003b7e06bf8e555129cccd88ee0a1d726f5e914a30980548d69db28b2df16fcaca3e9e88f4b7b1bf672e0048fb1c27d00da44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f"; + sha512 = "5772a034ba84844656c8d93286a514e49608e5fc1a2546d9b70631562e0c3da79f57cc36be1a4aec72f9ddfd187017db588bfc63af3142afc92ca331b23f32e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22"; + sha512 = "6334057dd3661daa8434c1e3069b7a4e143fb148db821900b9f7c71f152777f77741c7dc720ef6f1513e4402abe83d51bb580354fc3355393b75488aa8969d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145"; + sha512 = "e73a7fa1b76cf4fc112319fa09685edb2a64a3048afcf4ca4f6fb278a9a10a7571fd8566968d7e9b1a86fbe4e262d9be5c8052a6a2a31097e2aa16a3657848f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70"; + sha512 = "6f52057beeb18dbaa99e2762ffbdef7f3da69cc1ec4801fbfbae4c3f8fa12619faa0086dc21abd92c656d7117022f241a70be18798e93bd33eb8ef9625070ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff"; + sha512 = "0069bf5b9c5499d3e5424b9043ac5f61ce6d9cb34ddb329a40d30482bdb79d1a0db4f00b14409690af4f0b9afca9f87cf65daee313da6343bae5e8684c1de266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc"; + sha512 = "0cb95a2b288f7042c1f6767feb1cab88d345e0f0298f3fbe3385e58c5466bdfb59a2c28683deb3a8fc3f4936dc991486295b1a920d1bc09df96cb77f58ecc4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d"; + sha512 = "4b9ad14926a3c952ce3dc5aafc1a04036c6ec45a7a68835f512221ddef13d67c6473d40fc0993cdafa6d8ba6927910c20c089b331233b1b6f493c048770d7e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9"; + sha512 = "e7e748aaecb30b7ada664474f8b2f2f9a3632d58b195f895094de2d4ecc5952948cb688dce1a151cb2e3832bdae335ef74017241d29400d237c828369bb9c392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc"; + sha512 = "4799a27cb22216e9ab2f8b2c18b18edb6eeb101995e804d78e86a1c79738f8c9a6cae0a3ae2caa1b1b104d4eed2218560c80d0be53b3e453419e576ea3eb5312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c"; + sha512 = "fd26938de7e4df391edfbaca4b7d536bd3ef96ff53d85bb26b62fc8e9e1ebdaa344d69856a217f004ccb0a2a9f5aa18eded9f62f5ca4196ac07d845a80f74043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957"; + sha512 = "bd753ea3bbfc389028316f76784bb0e4216777e34606b415bbcb6efe45095536bc5e45d6bce6bdb632cd59a3d99df18abb4579219d6fb1745ab81ad32c9d3939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2"; + sha512 = "c5f8ee1bb7de2db1a6310b49c951749a0779f14fb3dba73fa4e925b69c7c6740330578e7762a796bb313c43ef3cd9175441e7494ccea719d1e904a7d06aa4947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16"; + sha512 = "20d34d89e99653649766cd6f7ca49c0cecda2b0af76654fd077fc8287c730c49fc1050f7e30095a0d83e16a4f64e1c78e9a9119048d57f531968044d9ae50295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547"; + sha512 = "543c4cc7ae137bccd1e4f765ae9c4422605a584d939ab919d481e761d29cefebfa664e63ae1c40b78b12da9cc185a887480c93b5af64449a4b321ebedc81abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a"; + sha512 = "e678f84ff6b82c989217f1c911a0d3c1e923785a8f0f65afaa4689bfe44a591d3b20066c93b5ab3c594e3330056435c5df86e1bec47c5d9ce6de0dfc68c65192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544"; + sha512 = "117868c399d9f41bea55441fadae9f6b7af7dcba2f6063a05ca7f2bf8f9197814f9314fec06cd63f3976cf389ef2f3c6425fb0890fd08cb036e8612c68f02ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f"; + sha512 = "e2f496ccc935fe978d05675e1152e518bb1c7a4b3cd393dd8d30a2f93cd586953df027d06c108f3531e9228c25844e7fd83d81a7caadfdec11f1bb5fb7dfa3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2"; + sha512 = "d56dd6fc221ec085864c50fefb57a8b4a5c11d6dad5bc5a3a24ed2b968eda816ec1fff83b00bf89e5fec2272467147ab5a6e14b5e6f5f0be25b5550aba908870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176"; + sha512 = "ecbb9f624aaca6a02762ad0c0c15b9b6e4732efea4bdfe90f3557e4b242cdfece657d4bd71a369901b4866a36e6a95534d237f661c897c5375cb627d371ad3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70"; + sha512 = "2112e809b6109d9367f9257a24b0c4b66add2c63ca456647712e9ef4ff04ea0c38990e334381c4b822789b86b4bd9949e68ea323b95d626f1a5deebace4286d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80"; + sha512 = "4291992b179e7d2c07d38b7bb0c41b6b78007929a535f6689e3cee287cbb11662c6e94e9e1d64dd20efa5e8b5f3d5df5f554d196d1e6a8606ea53dad2157093e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c"; + sha512 = "bc2cfa0b6729b1bba629db9bfaddeaf1e15ba6820ccf694ba2b468700b047e22ec8d8aad47a032af514e602023bbc45a9c94e80ca251b6f70fb5aa832491637c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84"; + sha512 = "f0021641ac2079869d698650bba26f3c3d9a265defbe17fbf27f7cbaa7be2ca76f37ba4e03f3adad453d093ddf768155df5ee53774dcc47cc4fa79eca3cbf613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb"; + sha512 = "169d6be0a9e344353976f16c860e8fdd68b75ab94800926ba63e6efb108c6af9116d18f48485d462ce441f2bb1d484a934756ca16d5f365c9280ff0f1894f832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04"; + sha512 = "798be99da60a0ca0582b98dc3dd4e3f9c152e0f85f82a0f14adb7029905a206a801339d2565bac19c4acccdbb4617cc7d9f5b36df0497c3f33ca3f76c9fbb520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740"; + sha512 = "8659e136e27aea77acc9c73b679dfe0ed8c93176b70b69783b46828806ba41c3fb2f9e5b4679dcc554d7896c74589a86d8c9b35fa521ca84f051062f884fd501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a"; + sha512 = "effc8f5ff352e6690ed32fe5ccf0c47d136c43a083fe8223687e6c0526a772b9120a15d3418cda8a061d1964260a9d203c552dd0f5a030f0431e62dc8304f8a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205"; + sha512 = "bff1f5d37a33d863fba0dab07d29fdf963c7be207cae27ad15c08657627896597c96bb6311aaedb8ce797e7d5adb3a7918512ef611836bdb0c083005d534a1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0"; + sha512 = "a27f0f158d2384207448016e0f9a3a9752388303772b5765707b6dfe936f66890705849b490e00c8330254f872813da064639e666e4122cd1b6d8978ddaf87fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3"; + sha512 = "d1ba5363a6629dbc62cbc9671ad8920a1c29ac9f23ac22c42af085ad862aa924d650a6349f5ae8ea1ecfd8a285205e48d7701a0ee72b16fb7c64aad4d30d497f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73"; + sha512 = "f6c5c318369dad3651d0e65c79ccf7f3dffada3b6ba93455069aefd6b2346e3fdb630821146d1067ef64199e6ce737101caed5e474344a1e62780304c12dfe3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6"; + sha512 = "bd40bd6294cecaf72be721def4e26a0a5b6056e561a0980f2945202f77bb44dfbfad339f246f73159a83a4abd46732fd59916408c922dcd7232318147f321ee4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01"; + sha512 = "6d679736a588fd52af304764277c50466e296dab724654f928888d615b7a11254a96ac60b5350d2d35d4d6d534a4d94b684afc90c52fc1942a3521907c009eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d"; + sha512 = "0c45ac0a18279e10ac6864f917ebb98fb1e199cf14ef5cab1cccf333c0f7daa29ef8784bf55faae82fb7b9ea2d53384415e84a166ffc13c0ed0928834372cdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff"; + sha512 = "d021986f8d7cd98910a1ba7f1b057f5dd20b3c3ae652876be69e948f29c03515e417953a4c091511beca1a06d7fcf1df8dcacba4f32653601b0fdc1fc619d5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6"; + sha512 = "e112cf30bb21c7c30dcacd6fc214863070b4a3395fd02701e3914a4a2bfed59d82234b5f1f1e22fee9824e8a731f0afba52be71c468f2323982fbd6408d558c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554"; + sha512 = "f648acd408ceb7637851ddf05b3174dd7a1a201dd07856138025a22a181e17904d15f357cfc2d3bca0a027c7f43baa0891d347a65d0b80f1869ff1c951021400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6"; + sha512 = "3b8418ee8dfd195db7826a476613b47dd4ddb6e8b2b372f85e68a588ee13de89e89c3fc2e233f144c2199b75f7d18b245c4402f111f301b44be5c75f1eec262c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362"; + sha512 = "a7be85d807202a0abf9704b43707a1bba75bd45f60e0d5e1cdeecfd1c2a0e932dfa0e16142e411ae2cbd8c3446a14c04766e50cc3ce8586a641c3f897172671d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908"; + sha512 = "eb1dd05c6c09998b020e21e344c0ac3303bf7fccfc65a0d73b6bdd3d7d371507a6b3fbf0814d621944d5b9ce57cb4e19379ef317e6151416a9f6cd1286825be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f"; + sha512 = "bdbb17aa801fea8a3e70ae75d197872a35114ef7a49c7ee56cf95763e26e2bb44a815563b2fe9e630843543599812015224c6634646915864ecfcadfed9ac978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72"; + sha512 = "915552b680051884db4a177ff17e19515352ef90ef4ae88b39abdda5db955bfc34cb92c65ac8ec4ff4a5ab69baccc42a91b3b079c0a58a93587468277d620da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39"; + sha512 = "1b3ab8420f3f18731385942f1e8012096708c49d7dd1614ee1439b80f5a742ec0fc481a55295d6f6989da4346940c58503fb67d13eb71dabfd332f84fb99c524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48"; + sha512 = "7d20045d38c471aa368401f0e65f31c08744953c96d15aedbcf306ee3d0b7e01a80ed0a6e207115565ab2bf1400312e9e7a8da1048af299f9b74c9e99ca5dffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a"; + sha512 = "7364dcdabe219ba4f72355e74d9e8be9bd5a08990910190753df3a6de346964558e17840367780e61b1647d507ebb204ea11beea703586aeca2145bb8a9cf9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c"; + sha512 = "12c3c49f0f9d80cd03a32fbc20f329fa7c34cbadc1ae625946a567b1b17b53fe1149ff92e6b5be22c5949a65024f9b24693a865a38bd8b458203329025fbeba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0"; + sha512 = "808673a5345e56c6206f116fa3b9319de2fd3bb4560884236dbdd133de03e4b065059066ba6d6490a16bd6d2dfc5007f5ec00149b2cdade6fe91034fe4b2f9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82"; + sha512 = "15f0103356a44255c523db8c5dd6703997b18ff0a965beac32324180c631bcc3c57de1ce65f1ba98820af1c4c2c0db293333eef71b33e3806dafd654223cbf0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714"; + sha512 = "fb8803093663addd2137bb336277bea3ff021dbfee15ec29da92ec92eea62c714f7a23248bf3804b276b58f82985eb34e28da64be6eea516aed32842ed621406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a"; + sha512 = "161085ad5441331f70de49afac1d4d22ba7de31259d8675a828b36eadd36a0cfa97a800881a99fd3f8fe8a11e03b57d0aa7e4dbd15948457760f25cce0b76278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8"; + sha512 = "f5cc1ca615966721bad7e1c440621d9a09c1589ca0aca4b755aa8818c958b0e9f5e2b496aade5927dc0e7061c566794022a1ca38dd07a79683e38902afe124d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b"; + sha512 = "f1ebc2d348dd8dd908b84351f51403b069c3b531134289c03240746927a46830dd47a54b15235ae86dc2cd5aa01d2c3bc94bc9b3efe45d35e8c4bc7123839852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe"; + sha512 = "b6facd8e1d5ec870468ff024f4e6d454dd45e35561d5c4f3cd1c58e025c2868922d1b44a2f7520c82eb5911b7a887c98a614e7785f6ed052ecffb0039720b649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a"; + sha512 = "dd08da071d273041c6e442938d0957a0eed3b19b228c8e83ed4f38cbd481aec8759fd65639cedb2de8f698a79ac6b803dad3e9939fc30a327222a651034dbbe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c"; + sha512 = "be151a11954741b6fabf0c083f708f2063aaef2ca6ed3c63eb887c48e3e1d7599dcca4de4af946251a01bfd5e4c9d32f85fad749c1d345879ed54b829eac3f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46"; + sha512 = "75b069efe46f4d47434cb1f0c12fa19d51138e383ac1aebf83d4e2261942b7eee769b1a1a29a9b4e28450382d47206a8649b12fbb470c9a594141062f5e2528c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228"; + sha512 = "77858037401e6a92662f488cce07849f4074c084c9b2b3b30652d3555efd11c20beb2ad1ea927ecdc8daa368f89b02aeae4db7579b7dbd89b5fcf91a82197aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990"; + sha512 = "3ce9fd601346a4552d9ea7da3a3c8048ff72e1f18577b8eab156adb1b8e174e686866f52369108d1351520354fc6bf6af2ed9e3f1fa6e64255948cae9bcbe068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909"; + sha512 = "24a72fda7378ab7a6ddbc4cc1a0cc8a37af81cd75516858cd5a8f659e14b2528937c846252d44f379a08f7d041509b829c29857dce37f247d5bf810208cda144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2"; + sha512 = "0d826036fd6dd68b787b748e34e7bf304b4233fc5203bde7581b771725ac3144c6aaa2d50fe854d01999b44a5e064c63247ddd02dba351cc6c89fd4facf70720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71"; + sha512 = "606aff032cc8fcb7d1739e1d6adfe3d2b05f1a0de6b5613269c5a3c2410976542bf2faa9105f122abc5d8891aba51f69b2fcd4d8dbd88b43112e37bb532131b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e"; + sha512 = "974eb2e7fd4ef1e93dd96a36199afa518a421fb3fbc59780bbd815014a84533cde3a76908af3f051f3be7eda8dbaf6041750faa44d264385f33169130b5a4174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d"; + sha512 = "d6136d9049d9d19025c7c47c9268f1a93a5ee96bfa993078b3488ad23a9e29fc00c9450ba97e25608b7ae27d84cc3b40dfe50016db83658be6bc300b3be7cf04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09"; + sha512 = "5aec655cce588bde2465b5d827a3d8966e588ca083bbbb452a2a6f3c3366478ae565a4f9162fd0d5045beed76f3aebfd3f44233e46275eb0a53e33efb079d1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825"; + sha512 = "40663403f97dd5a89d1853c7cd5ac0f48c761c23c6823314cdb7e821f83e1ff48f7eb3cb123784d55b7771dcbc6a2c2c4ce3e691642d25685817eede03947bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a"; + sha512 = "46600e098ee503aaecf43e161a54ba0b60c79bbbd61de65f391937de3659af2520c013ad7360b9ab1e3aaada63ad371667bbb5633e46f8942410ecbb22cf4f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3"; + sha512 = "23e08b80859f6482fd8fad3d2a43961fb12a44827b5fa149c006508d3778ca0a3e307522e777535ec693ef365b0e2957344ac26a18bf05381c69f9dca509a9f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1"; + sha512 = "54433c53212ad816d27fcc176f45242d275cca2e84fe68f985404471929c2907e95002a85f9c6141f8cf494bf6844940081e44e8046ede30ed6dee0b72a9eb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e"; + sha512 = "ee04e06bcf36056a876e9c4eb2e1d130b6b882653aa7ff1a313e4a21054741a7fe46a8f74ef179abd52b03d02fb4af94e4b7cdbaa885a4c1f019636c2b4cc02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324"; + sha512 = "0cb344cb274b27088af5d7ed41c76db40bec19c11abbbc421bf9efc7acd303156efdc5cdf8140bb022bd9607932fb636e678bdad16e8ea0b8f9a929be68ee081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf"; + sha512 = "23a5f4c49993cc8727583028b1bd982845482261b793d50b8ce8779d3a4351549eb046ca35cac2d7edb6f3b40deddf077f6964d3e4a56837649fe86670452988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75"; + sha512 = "7052a71800b2a5a3f9ed89db3638f30207da4f55887f4ce65c722dc326ad42663051384f195611cab20f86855a5b2289bf9c5fe2fc3c78c740afdc5a435f4b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366"; + sha512 = "6eea9ccac2c6100d7d7c9f80af4cca596cc4e3a0f3128beb22c7414ce0ef8a8e9f5aeb9e22c9fc8cf30db93eebe065e80d835d2927325fdc7af9b359e7b55b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695"; + sha512 = "049cb4f60f812673bf912b7ac06e440e40bbcc90f42fbd3e12f5d7ac08bd5e4a4897a435a1481201762d9fd4b99db954e838385953d9f458b80f86ce66b02ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c"; + sha512 = "fb7db4165ff21463fd798246f18f7b9337b167c67e54d521d3d7e5bb5433b5cfaeeddf57619cea4079e852573bf109c57554cf574615232de86cb5ca922263ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d"; + sha512 = "c8dbf8652a5a4be2325ef28a43e5cb8b464fcd552d62ca5241b072b9450ceb54d70bf5ac30e1136d03dca58410107c7d70f11539a7b712e3e2cf0da43c33eb75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3"; + sha512 = "66f1d6cd06e96d8835404446becc6f38516f43562d56a66991f1a73ff9915e0dff9ec31611e89c5596154a2c4b582d84bed30186691353ddaed914244575a27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3"; + sha512 = "aebf87f18e27e8acaa0c8956e7f90bd88da408aa266aa96285ef0d3fd85d3f25751eeeaae58e86948d4ff8abf295babc23e3d3a021e50d7c1329b2712306f64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66"; + sha512 = "ff444997ab3a90cd5c4afd83a95d25c0d4d04d9dc82451bb8d33209433287cc4c31dd9f7887635ef4553776fe1be7407bac4a1fe7e5603679d209afa6717e2b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5"; + sha512 = "8d5c1cb8ec1123cbf79cf156b54c86c28101078bed678b41dc996f42cad0b9d1fbbd83b02970a90f265e3839c2aecc9641d7231375146917b671411b02c913ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a"; + sha512 = "452eb08a1fbd0c27a382707c8417717c3728aadf5eec774fc3a020d46f4bc598ada9ace6ce49661f14398ae5b618491c070b52cd4d5fb3cd304ad2946a870757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90"; + sha512 = "379362f6fa4162fbed19994490183200ad4af8603ae0f8809637953332b811cd754027636f9cb49b5e5b851057320b5f936d09d1193930c6b400098dbf5440f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4"; + sha512 = "ff457ccd5f435de9b03208a285d1c0e6ea942ff61592e26fa61e4946df1efec988f9f1d94091618c7b5d0b223c45ccf67773e4513445ee96bd1cf1e354034986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc"; + sha512 = "848ec90aa86f0761587082720b607c4b3c463300dbe2b97d7a59eb4eecae3263016a3dbcae2e92baff971ab2c4180f6a68abad52f3f74f72c0dc99d9865a0e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed"; + sha512 = "f0b0d4f81021010cefbb2734859eb771d0943d8bee301064d11e222c625bda65f12a322e066a363a1215514cf6ef7eb601bc22959a6e1fa9f29ef8da0c02bc89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9"; + sha512 = "0ca9911452654086037a09bb49aa7b5b200f42c40af7b94ecb55ba527518587cd5f345c88295cb43d9df8391a0f975cd35945416dd48057dbe8d4138cc3ef37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085"; + sha512 = "c643582dbc92145a9ade0d8763c8f30e1fc0fe3b9cb55dc6e1b88dae3001a3dc4b05eeabbe9b0fc040fd37f30f2d8cb07dbb7fa801d55a8e273bbd61eab69261"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 2ce8dd8190e2..6834a57c015e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b4"; + version = "57.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "89c24fdc8c2f6890239c9cf907a52ff18a20d46286aef8397ca0ea70ad3ef213286728e80c1bdc288f9f3f5ddde6177c0573f3e25e18cd88169bf4509ce1f647"; + sha512 = "32572bd7029c8123909c35c36d8790efec84b57ffe1607cdbe4b7f9ebf3d09d5b4e750d1c347094790647eddfc3ec20f083576033b2fe5ee147787247d316a1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d262ac9e5f477afdcec1244d2e70684e308cf9783f94da76d2401a0dc24223d19f1ed7e9deb51dd682292213f1cbcf70439275387aab509205b5f618414d9563"; + sha512 = "edfda6b78cc45d7f78f59f23e074abc605a7776b27b89b7bd8d0c171eab9843716af28bdc81b53c993ea16d0e057611fdbc4c3fad7c2d6781ee1847e759057c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "bc8ba4a5732591680a8a7cfe6bf56f23fb40782ec439a1a8eadd822b11d6ffd830b82a67e4b99b60a607907597abeebb35ea838695f75c48fd6e3b9341d577ab"; + sha512 = "0a6b80080457500b2b0757491d74696eca3132123f146c17b75ceeb5478bf8ff6a4fbc6e397bd08424ca1df36b82f3b9903bd5f7d5b57d52cb82d9e19ecb8d78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "23093e975a8401e306a876f47aa5c1afd93e1d17e5d9f915e967397f1c920456fc63fec2312aff23d076105cc4f567050317f3d48a1d32a016313a51df7e7f4b"; + sha512 = "07001d159fb27773b16a8b8a38d9f6585b2304dfd9f02c9210b0dfabaebc8437ff7ecbe6d86d4f9065ebf67a89206ca870c339e0dcb70c1ee265660bfa060f08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "8c179446514b3ff29e708064418c035c5a138776c8dfd957562302e192829994813ebf27fb491e0cd204399dc1ccc04f6eb5598c87dcca53e507db7656557f8c"; + sha512 = "caf3f545e2bccf5566d2b5913ace96ebd304951a1428790219b74d8fa4461fe8fcae97af30c60c6fddd4cea88f5ad65251db656774acb8bad730ccb75b2ee425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4a2bb2543e66936dbe1bb5d80c3478ebeb00eb11fb8a83c8aab18440b93e4cb59c24fb7b14687f940d19cff4c9a36e255766ae712c224a02635e41e5e2e84a18"; + sha512 = "b1660d8c853fa8a322d112241c926f48f63e244baa8fde8e7fe5f703a65656c1c33ef33c6ffe77c9f9f2147f8d27f2cf24782c794670034719fbd5b78a9bcc04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "cb2cfa9956725d58eacb6b5d9317cb050ef959cd92b64fe2de5c3390855e0976d5a79805c134f36d80bad1c2aa71204bc04163c0a1bebf6977a96449f603d0fd"; + sha512 = "2d299a7a9aa0e8eadb47cbe2651f4fddb09c21984396d3f41d3d65faa05324768c4a7d88c273dbb3c937aa65086124919f77b0f4a1541d48534a70a01d7077dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "33555541b57d1e056bd2706834ca47f9b93ca70a1a81535189a49e50633f164372ffa5b36a0d47607edadc93b0e1b502ccec22aa6956764e0461cd5ffad133de"; + sha512 = "75a7456d7e7b43118363d0ca7ce24ae6e2727c23542808731a3351c97e2d7fcf2aae44aeb9fdc460dce7ab582d4c8e1a59abbef51284f4fc85e8402307510dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6a829c951817812dc021f76267dfe86c2e1ab81640f1538754b894ce8ffa4d0bafbe19cab81bb96d1b3177ee2c65312f7ec70fc68effe06f9a5a79884b69a951"; + sha512 = "ca4be119b8cad3fc84eef3eaa0dc86ce9f6322ad39fa815449866ea13c343ca421c0d2de47de91e5f6ffba0be3d3e04af4442e55b8ef44b4b6ef48fd6ec8bfbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f1e96e42d57ecde22ebf14534a96b7253dee92cfae55fa6d9c5570060abb9f25a871ff73357f84f1b015d31b792b77568d5aee434f74576ddf15f9e62110fb74"; + sha512 = "4b423a596cdf870b17c2744ba440e0cd7cba5218f76c1a1c9d088c4f1743f5d6f34dd7b0798221b26796afc5e888bdcd2246a84c446d543753c6bb80a9fce701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ade99a45c062478797b570e5887e8702544f6bf47cee57df6b6493d05c099fa274c335ed84723df8a699aed58996bef3379ea76b7d6290212cd5a532c2158c35"; + sha512 = "ef308ca2bc4eae44d95bf791b42e1950fc969b750e5945b1fd2b1241d1768d0262065ef5f2a5afd8eb422291977e797c7f6fc65a2e81c88bf9f8c6b092be02bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cd7cfec9f80673147b07118e71608f3486b8f53b3d9b0fdf4052c9afd2d93e6dbe87f6d10d68a658e7d958a832961d47aa663d2d08e1e2c217f5dacc446f9221"; + sha512 = "37660bc33778bbbb6831710fe34e28d07a52fd1f2a5a3f003d32e89f7f3506bd69f97c45546816f2737ff21a280274f1e3b68ede955820a127941b293aaf5f71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "01bd5f3a28f24441f41f06becd22e4f5c409b2c7f4eaa19685ce49606e26f598874268adf7a579aafdd17159ec4ede03cedaba37a3168bdd19162f10af7ccbfd"; + sha512 = "fb60c35fd1782d5553f8d479613bd037c6014f7bc15797835bd63537df86146e075879cbe5a144b7f2aa9c2a171f6fd13abe7ea6376cb431f6733305aae79594"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "dffb22850e7ec4b98484de8c1e92faf62dfad8c8a221ac96d393e11e53c2bdc638fc1d3d1bff2987e483f6a7784eb812d9a1aed79278b1c371bca27d23904551"; + sha512 = "abc66fc5ab47aaf90325df0f699df3db0161fea9ea72d19437e9345b0d3740e80c8e435455941c3eb60aada521c1690dc05f22f833e2ef340677aa85960b46a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "52906187bc01333ff67bc6ce4f493412ed77bf85b6bb18d06520acac5fed6790db9fe23c2c4bbc751706a6232e42ca62a566523ef4d074410b96a54651023315"; + sha512 = "7df49494bc2bb59c42f025e89081a3825ec27cf17a27deca9c7aa2757ff8c2e6b5598bed06af0699fbd3d15d0e15aa88c38908ca0a96008a8382a5b4fb058c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "749d3d5781f266324aaa8c7d3bab777ac23518fc69bd3f1e1f4b3dbeb28cab17372327ca5622aad3841a56c52458c7cb4cff1d43b4fcc47a0e071f4c83f07fbe"; + sha512 = "316884a24ba4aab3f65df9703ec7b4f201f9536e8b3f8648addc274fd99bb4d5a930e4499be319e040a90097c6b0450a3434a2b1f264625baea5f27b87271233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ed5cdd72190aaa2a7cb762bf5ed3c5e1fa7f6b2e0b168810b4f229421965520ad796ed27ca6c0c4e221d63c43c8034ee1bdecf46caa913d48c6e5eec1c132613"; + sha512 = "929f32656a4c0ced25edc962d43d4baf4119ae75601cb8b5babc88cff953721edda2ac3e300762a8201a161db0d28abf2823de01b96dee4b36721a986d1cfded"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "84194c9496c0f74a4880a4d1d18c9c1c9b82a684cc9b1316d8f31980e8bed40125b68eea826063a6c12e04f7d55128fd34a954dfaaa37182f56eeb485867c3e2"; + sha512 = "a8591c86d85a02c146b4695ccd9839eb311e371db420d05301359c833dbc462bbf33886926c602dcf21f8dd69d76fadb5aba875307b24e5553005fcdd47e0cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "57e129dac6eea631934e1c0be296fa8cbb54dfef73d5a2233655a5a08589dfdb4794eaff22515f000f6fdfa761b9c24e6d72dbdd406153047eaccc57328cea42"; + sha512 = "8156fa17843960aa2913a1f12a59e6f3827dad26d4547cc5758888c7586e1a04360a5f41087356002c110f9ac60fade703291b7fd462cdf11cf00858dd45edb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b3c00e1aef9f55d75a93d7c5c48b6e02bad615c893394055d82a1aefab32e1a5edd82d48f8e0c0c9b550c390b543ffd91a5ef104ab39562025c3fb3992ba1802"; + sha512 = "8d79d413a486073329f40caacffda50f8dc0675dc7d99d48fec9b79b7463cda180e6717fb15cdcb6c4f5aa89984a17c77f3703feb6865d802fbccefc66eb4452"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1031ec1f99f03fbb52da4dcf7022bd056fb4a59e15211eb90465cb7a38b42733621bccabbef26d582e9c9fbef20b5d8df4d2c1b96892653220abb02a2e026758"; + sha512 = "17619db107b1a35c0fb8cd0130517529e9cae38730aed31fc92340379228df3435b45b88038bfe421bf4833eb78ed995997456529e15fbf3ef9c823738dfda5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "92ddb6e3253d09be9869bf43f46cc438a179a8548011c28f034100aacd4c7c713b3235beca9aca6c8cd3374fe30924b47706f848f9db4ff48faa1b40b83f96b0"; + sha512 = "5d699c809ea1dac35a73fdfcc3c7c7be5e7f35a34dff1c8e1c5a7e536d72b445c3bc3197ec53cfdcf22a9d9ae43326c958b5d0820218356beafc95690d702860"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "039bbed397137d411448f4090ee7df8b32e119e844547d209105e3d30782c68ef4fc6ebff5d4747efb897dddf3d07d21201d42a6084821ccc82b98b3d6588cf1"; + sha512 = "521728456d45ceba010ba8c8dcdcb581d08d64aad0f40294a0f1ecb1fef702e669cca37e35d35a89ef1b9e5bf891d72853aacf225a866c0e0e26ee9d61841efd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3cddea06dbfd115013f3c29d7dbbab73fbb4546b6aa16db708c88dd1a042e885e262e1eafcce76091b881cf74a4e55479d0362acc8b0fcb06fdbbee3ff4c2b97"; + sha512 = "f86a0034a310fe26d276fcf867c85647bda35f07bca2cfbac289523a618493e7200668bccf2928f0e56f6f789be4db76f2e344cb3a92c63b6af15a3b682f0cbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0ba19868f136b4a621df3990a784993f78ccdff291ba61aff85e1db692d090e9e5bf1721cf71dd61714d8ebb78c8b6f9bf1ea423075a69ae21415bae93f4b7e4"; + sha512 = "89ea9fff345bcb88bd67eb1c10afb08efb68988c95aa2e489ed706acef083dfb9a1d0c91f00247f7a0afa92592208f356f8539ead8286b4f722014792bfac2a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d4bfe8cc057abfe1ad51ce4e2aa76bfab5db4fe9fc256d7d4fe6810f434ec7c5068f9c9f07dba7b358978d733176c3eff7986a96856b0bc662a92a73727d1578"; + sha512 = "89c07f845771e87e434b36fcf5e9dae459d6b47dfe74715581972ba65cf78418c354eaeb28547de532ae7e53869bff6e94feb9fcf37c7eaead54282e883b0a16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7a17c0314dab8e29163a18d7e14d5963d908b8b290d5f8fc3f34c4b2b4eecb036d5f41d9f2d1ac4334c4a9c082831ecf01f8d0540573caf4c611b2da3658f4ce"; + sha512 = "c03d76db5d9f8f312077fab403712eebe364ac0f25aa57c754f2c2ef42082a475c0fa8e7447f1bd3bbb72aa0849d1604371c63bd28444db568d42c9f2829ccc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "27c859d93a32cbc1501243b975eccbcef0e7b0b41d3149ed941197e61b1d48d85247a8c5bd22e3cfa445d42ca2f8d44e7b95ddc165e703d3afaf41a499b158ad"; + sha512 = "570b824ca0671c8444e5dff3a837c1726f47b2cb033099d051a1853215c80b928c2a54b129e0d75fa888fff3115e1a51383444737f739f98076b53c44ce6a2a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6f570232aaaa41332f69b7df59ec3822870e53e8f8c012dddefb36bcd2c6252677e63d8be837d0f6007a72ced19b88b5e9b1f837a72a97ba271e086e1f7c43b4"; + sha512 = "1c40abca0e01db35a53afd628e7eb15a9448c6fcf1ad1655f2c201373ee8526c2ebd749715f068254757218be91d25d00c3016132841612c9d5b1fe0ded792f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7c5b92e5801824f3e3174dc5d9bd4604689520d7c466658d0c987eb0351bb0c24ae4fbed019aa71e57309d2458cee38bfa4aaf6a6f122e8ae73493c44f177156"; + sha512 = "4df4f29036d1f536b88a95fe78936beff16f0b7ff1c2394b0c10af6f12b0b6594866816d162d700d8ba28307b52cdec46090dfe77dcf161716bfc1266173b05e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9717f966ef2d75666258ea45c100645c2a078b4ca2ce0e9090058b65e4eb605f1715ef834251032bec627ee66e63ff11c85af6e7cdb97ee74285a0853bcf6d85"; + sha512 = "6474ed745f607d8b989ae1bc72c47717fadb63875a706349269d26ed1aae990e4784e2c5147dc93b6e2339562c568f5539d74522b66f94843dc9373b41e1b7b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "44e20e83215619ff639ec12c5e60d5435d617438a7934d7e6d5cc6e865c3b6caba184fa8a786576c127eead4d87cc37cb6ba9cae72d59ee822d746d5790d2381"; + sha512 = "6f9c61132f2310c4c0b08ab7356712acae16cca16e66d82cbd77cb9c45e90868b1f901b68334d9e462dd2598e95c3c05b74c5026ede1f01e69ea8090d7fa6e26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c2fc1b3b865652b90c8ac44322369b2278cbf4d95531111d4bc29735878660d8c4bdc58d8a2217454ec3880222a3d695b874d06173536217a5391314f087dcf6"; + sha512 = "9551db4c78847a6f8a0431ee47522a7923f9029fcabfdcdf05bad26b238af9926a6b6a1c21bda2b38e87b67ae90b0a33a09c2477504b865c41854b38acef1a1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8253a890bb6db0eb278d828c51cbeae4331c55b2b4e36ce089249567ae74570008feb72929534750bc47b8ccacd64802e63faf00c354622a548a5fd1377b49e8"; + sha512 = "8d86d0feff634ffdae2be5c691a0da072e86a255addaccc93d9e6ab849fc58b43c2b0bf5b01ecdb28711e88721ef87b772118f096d2da5c893d95acc804ac4fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "df0483afb1bc2b2981290fe6a0789ad153ca529700b86a7f995303b22331b5faf17ca3bcc916f2bfe5efadf66d0b08d315c6c8cfea0073e1a31e35769cd00761"; + sha512 = "7784d578af3cc764409f52f72a8de78866088485037512f2d0ed6d7abe6c2881fb14474e4a17e9829d6185a185df9519e7449170af4223c93a0277a2b6264783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "38ea18ffd76eb89f317696c9bdd2bdf3061579b277680d86a85f655f915c75d9b0452bd320f8818a890e1b6332c22eca98c5c0fa2180d25586ccb278019df67b"; + sha512 = "3d986bc10f2a4ae11319e08db71cd50cf8aed27550831a399a99709a73abda01bc2bb85857bdffe5cbea06470c8e78d5ceec94bd93b5c5e714620b975260b53a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "86c90f9f4dacd8111337341dfce981edf919c176c9ce08747619380de2ee1ed1ebd8b1f15d18e7d96f7db3b89fec6012421dd8d6c4f84707ddf98d30bd019db6"; + sha512 = "8b6728c64452d533f59a899fff367ad03b5b0309fd908086125ddf9c924bb6acbc3a48b35c9787b69e598ef1046a179c0ddc0dc7735fed3fb2176e4c875a054f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eafb289aa4e7f6979a9578794c6f119eff119ed606b576ef732a2f6838455b0358f4c7acc6103ffee35a0dd5cda6e5438ae83b73dfc9ba0d65dba95e38e274d7"; + sha512 = "d511fca44339a41bb9c1e9d72ac333793ebd3b0dbc3a1331b1d230246aa6bd109905aa3fca44212328c3c710868b1de3dba3a2ed4d1f98f2916c14841eba9c6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bc52599558f41f399ce45449ecfff16f8a053f56808c85714a8c9e58187e440411a80b8047e46ee4cbf364e4e32eab16a13e31276b1d6d4380f3da5ebaee6fc0"; + sha512 = "a817aa07f4ecb4d20a14ac7a69a8163c16a9916cc3315c27240356fcad2ee9ae1fd284d6c28b7f6cf587f45959788c2354e3625e83fbf6ea1051d932473ff8d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c4e521fa548e7fa0e5210f419fe5d76d357eff83e64b2755a708a3126d2404e31e929858eb216ef7891dc39870e8599f9f18b2743678f392275f589f90af8cd4"; + sha512 = "fda261cf0d175e9304dee206f2aa9874dea15422098e2701a269e66a72191167bc56c18c80399a5b703337ab2171925b7ef0410f54bbb265e3245fe4683a42a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5981274b6889b5e21ecd80a37f14b1c41ea217a7fe59d68e8d545fd6ab0aa8b3af0b3caf242f9aac9cc67eeae4f6b989050a17f180ec5594558fdf10cab21825"; + sha512 = "90c0219912fbed11ef6ecd620fbc1ebbb3324bbb36f049c97fa18402e1a71667c74e5aeab81efbad6093a477fbc0f1a8a96b9d43efc514cc3a8fc657dda063da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7f321af8d6c3dabd58afdfdb30f2f8bc77b8bd6c1824016464d1713e570d90ddc3e07c77b46972aff603ce804e0181090ba0a2993a838cf82244bcace82734ad"; + sha512 = "bc8e3a2ce6c6cde3193469247f666159a9f5581a739e20f89d0c9f05d83eda48a6e4211b057df0e201797c7d235ca5b48b56b27a3d7ff9e5b3a80e3f120b4848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "79764ad66fb22cd375b121ccc2f5ef4673a9a589fb2c4a1f58185b80f84d1dfa33e960475faebbcdecef95d7aed16bd6cc9f064a48e0db81d1732d31ee7e6aea"; + sha512 = "f69208237376f4a4f129c15f4f05fd7f2bdceddf0a78cb5498f7bd3db9a466cea6a25429e7a164716cf42bcc4b7c2030ecd452a2dcde4763f2eaa9f1a698d991"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "77dd03a3c6328c38e022cee9e101ab8114dc8632067737c937313cd45e9fb669ac7bc88d5dde2733a0461c7e4bdf8dba65524cee4e5ba3cfec704e3b205406ea"; + sha512 = "a7cf9db82a924d3a7579fbeccc93b31bbeffe9d044bb71813b3e493d0de40e646860f7fbacca8424d6977cb750c1bd3766ab0ef032113908bf4f4d010c91494e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "0b916b5b97acba7674e1fd6dca9c437cb5feb352cd6e98f31fd9f9e24b532d5309b9dba2e2936b2c2775488f0e0262f849ac08d4878d6a8329115e781f46ce4f"; + sha512 = "3c6f7fc20aa02c3701d8155dcbab0df13e6692760613ad87f27df2ca0ff5615b927bca9b7359914f07f976354d697b54d5ae306644a7e7aa312500df28353204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "48564c044d224ab4a02d0b33479a824b1e3d801a0d9e310b1ef2b8d2fe27dc392553af688b213be013c2b12bf22bec6cd69482682c9290dfb301187d0af03db8"; + sha512 = "4f581f0f917fefffd6b7df0c570e3107d36232a9feaf5f5bb9b63bdcb51a0b8f8ec27a6d54a7a73ab17ca579fa95d3be601beca35eca2765ce019f3fda8d9f1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "93b53ce5a08bfc9bcb7e9c59ae9a50891778625e6b716d317097ab2af5cc972df270e205b37b41801eb315f2a73d469b5922a753e838e7fff4e6cc827ce682c4"; + sha512 = "1a088aa909fe0feef415698a03665567665f37e1dcf3fe033c45cd7d591a4708f392439b11ec7b96922139575d4edc8442ba08a8974c36255c7a7c349d4ed059"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "dba243ba98ee8674bb9a252e88c6970efbe68e27ab363eea8d69769925139d2f71dc34816ae6738992b5bb07b715d6ad82be19fe7db886b366558051e7b25cdb"; + sha512 = "d185592907cda25a41dc8003b2bad9389dc1b56f5d6bf584e3f248abe0bde5ab548c055a039127b18960635338ccf28eea0fd8fd9c1c60f394a8df44f1644fc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9f997a155617259f13117e5be74c286e66ef8c0440869ccb6e2c531185a26c6c64c6c4c4d6a0adb49a589d85ac3a7e90ed1df602dcee594e6a84f1c9f245ed40"; + sha512 = "ab1fce5528ef7ca3b08eb21d1a653a91403952165a2a16ab0c270a0e799a616858017e2fa8015952556bb8bc132971453e799b01861e078e8774d3db0686b1cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "185fa90e5dc1a755e2bc109b8867433b8dceb4caa00451d4358f694b6e3be4778cc1fde187e092a0bb37051eb65f0b8209dad709d87233c604d53124650e94ab"; + sha512 = "3b0bb483fdbdae0895ab60032ec09ddc40cd5db4b414fe440e8a449cf06c1b28eafee0aba0f8b05bd7fe278dbef8039ad5d44f9c627198ab1d7aedb483f6e2dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a3ea11ce5fac0039b08b14f7b83ca00265c6f26e0504b5a0d74d234f9c214e44394253165a01e82fce416a998034b2bc121cf79e9cf28d7795dc2cd9ab48b0af"; + sha512 = "4acec36fe9193d742dac566677526eb0fbf028aaa3f3ba7226667d1ed6e74dd372f7493f01fe0a289aa0ed8ff3ddb27e6fe069777f6412cca6043d66a284e9b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "aa1eb7803bb9aa61629ed349100e5912311802eb0e1b55ca4691e3411ba2dd5b583a6b6b7a027de26ed9753d1498086c0ff2c7f831a21cf0d7f0e8f8a5a9557e"; + sha512 = "c2a7dd888e9ab06d2e3da86473a91ca12d25e496d58f5899de51aec2e6e8e8087fb65673af7990931c71439f8445ec040c514729d6d5dc45724130dab5056b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a9f6086b6d0eb2c5e9d7d78821f1d1ff6f8139c63d31828bfb42a0946011235f4748688cdd1142428439d34d106dd746cf34fc393aeab8ac34e84ce0516b427c"; + sha512 = "dfa0132593d19f2a68c15a3d7a7f9fc42aaf297c4fb8ff7eb6d88df0a569b10da6d52e5a3eaa8e51e48e890f946bf3015df053f4474466a3207768f0a9f28117"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d0a7a3c4e9f71f3c9741f2f3ef68effec78551559a7c836d6b87c6dd52aab5f2b49db07f7528cb4e7de53b3d505bf82cb961cdaf517ed14cb322fb09e20fbea8"; + sha512 = "9ca2aa99f561812ea2420a86b28858d62da2f9f91867c93f5605a9a46354c02b2cee873f828225e5c9f78a5bf147d071b9b6fe9307eed42ea950f0a16cc4047b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c9086ca7ffb62ddeda314a5bc48819391cafb891b8e674383199893741ed9bbf03ae283e2c9b3d391c6184be4a2ec779517ccbd000926d964513f6aaa9db02e9"; + sha512 = "2152dacb572481fe9ed51e45799bd6f723a80a4efb79d1b351cf1cbccc0674874091add0321630fc3f354707e91c042bba43bf9cd6538c3d18743bd887dfaf01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c530a3dcbf4f75239ef7c7b63736b9cdb2f2014c284e8d920552cc7ee4bc0dbb623f84c98d24dd169a5ed3683c816fdeb151c7d383f800682b5ff5e55af90ade"; + sha512 = "046895dc39db3e2f373de35dee990700d30d47fc0e0e9cf4287fad6b55c23dbda107b95b0a1675c897f09d2ec4249cc16fefeec33b1a8e655d334b19e7786320"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d57ec107d152b081bf112e7576d3b205f50f802b26b9723b8906dea4c5222a5c84a81185a64332ea1552e6db30bf5a1b4e5826ccd490e4eca79892ad879068c4"; + sha512 = "c87597a98b2c8c46fac817939128353bf9d1b270f5e467c013b7181aed4210527338994c4913d1b902280e6c3a042a3414f518a2e0a716d25db0a12c0b605af3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8bf173b76a2a63ff7201ee31a7738f928ac9809fc27c650d16c755808f7c3c00d60abb2733b40da993a6b3a02908c788ebd73b99ba4ae68c626101060e2dc311"; + sha512 = "3edf7e1e21ff356fc20be6bc82253535caa76696b9672ea3f4f29b4880b4ac9c1e6747f2953d6e9526abb4e5262b14f7b931bf9845a3b59bb1ab21facfc858e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "07306c0631bb5bcdc188b68c458c85cc02caef0544014acd1238a06bd5efb92e78fd6c3de7e15ec38b186861277160f65673fba3f7f7ea0a825f7e13cc514b21"; + sha512 = "7139a914d655ccf53a0cab44fbc3c3ea46e3dac9d1834e6acea59c74329143cdcac5365b828bd21b907e3d3c143a7345ea660c6c4d469418674626c971d9c9ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d11cadcaaaffc61d62f4dbee9991c0a4f11fcf7ac279223d33bbc2ddfca0243bbbe136e5e19736f206dca5b4da2b71e31700f2b1dc9b15339163c68ea3ea128b"; + sha512 = "05e98b288b71b2260b9bd8fa2aca1851c3131849b9868c1cbf42bf6b5ed622f4ef2f851db39977d77b3135cfe7cf282d7058d96e68fb5e39d95cdd12cc3deb84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "f29cad32380d7c11627a8f839c882feb8a9af9d6bac0a0270b3a660f7d216474dd4a54b9a06a6f84c8b94b0d01fccbb8e2cd298a66e3a1af1af5abefe9afaff4"; + sha512 = "0a84fcead91325eae96026f9a3439806bef6f589205f42859b3f9515c7fdbb29f37903c93f6e9e86b972eaa3e9b1e682b441753afbf529063dde307c2987ea91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "47835be1baaff9a1943d5171e6a6c9d44279760348af1ff172fbf8c3ba27d50236883acc92a69a8df0764064f186a401895fd38ff0f73b6b19dfbc5fed85b14f"; + sha512 = "c6d3dd3a1123d7094796466fafc9cb7e994824c95204728f7e255abd12004ba9db79ce69c50a3648659217d0c38863010c556bb4075a11883548bd47a51d2212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "864d4cf9f2bcb40d2c178620e621df1450750bd305eb0386e7471c57396f5453607664c177790ef2177042a269c034e5f2a3c0789a761d83152bf8d1b9407846"; + sha512 = "778885c609688d163fbbba87227ce79e7df0c9e7db0553f4754e23ab87f0cff0f64f7013b861bf8d96f7f6bf715786ac763e5104c983a46b1a3c23a57178a3fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "040bfd4ac501aae9bc8e05cc58563eb8804590c286fab7e30614de0df0aad6f7f09ad87e5b808fb5211fc97bb64eb9046e6f3daec96a38e952bd83011d09b17f"; + sha512 = "929c6fe735b94f52a26559525f3b846c7a9a1cd95c67ace534f19fa78246ed7faeaa817c004c23ff3ecd78352f9dda7a315e9f8ca1f895bde56b1f53ba8ce005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ef093c216bb6d7c7a9b6bc200739d678ad042f19bb98ae734fab9f7592405b80c1a8111ad76722615850781f97355a5788a089bef4d088bc76ad592212aeac95"; + sha512 = "3e5f73d7934edc570b9a617075ed8deef45dfea01dcf057c712c121302a95cd6e19b0dd5de0529ba38e4b7e08edcae06e4652f462c1c2fdbf423d7c5c8c75c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a1e6a303c084df5bfc74e7951de8bd59ea3ab58e25fa880afe7cb12be6399bd6f65db0f517e0656b165ed3083354943dc751d7f77e4dbe4abfea329553b4e28d"; + sha512 = "98debb77674a17ce8d918e5db0171436dfe62a1633f3a7ddd7df79f1e7e5d1252826ce02f86a231a94158d21f672b40e1714db443f6eecc218e910ffdd3880e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "848b504eadb4db1597a5722a42cc163af2fde27796644d4a3595883d7d5a86d19ca341b651a2825d8cac442a14688c3e1bf6b9da947f747ed20f9e9f269fdb41"; + sha512 = "06ee63a1f1a87c50b8960962a987cd1b91052815bf8b3acd495c9cab6a8f2c7ca70d1aa551269df3a53708e8e2ac48fe3324fb333a11330072b5c0fd3ee9fe7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "26c55fc46b96087acb71a7750cf6105afc07050f3779c53618d537e7dd009863add11d6ed8ca021f5a56eb3d3ba08a2928228f2b5b72e2d49af76e00c465e40a"; + sha512 = "978085f2e33c3adf8d540b5ba144e2f1090795758ee3b97367f1392e4a4c96dafd6f76f62d7daae9341b1637a9d6dd52c02fd43e204dac0bdc7fb0db40fef182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "28fd2fd88780cbcc8ae4a0d6a6958ce0b90ee33338061d6626419be50753f69816d9eab758279566472fccdb7ca5abc8ff257e32e93c3d7cbdd37c4f2f5f14c5"; + sha512 = "c62f38b2855a3ee3fd53461dfd9988ed3be866cea6351dc08f2cdf579313aaf238b3cae066b52d823f5c42f7628ff2158fc8e4d914f9372b804b475b5a2803ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "cbdf442439fb2c6c2c673cfc7def6262961bee951cd07259a4a39ff453dfc2323dd7653208bb1fa6e72c768935079e71d11afc22779f9eacd529feb6e03ce125"; + sha512 = "2094a90bba5a6795dcdd2c56324a8b517460f690194e0f7c1fb0f278dcdc108d6e2b9ed3f50810e86ade74cd5267367874d32011fbad1a52874454fb965882d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5df8c198c9a9e2a3acc8bcf19587b0ac40adad2cdda6a2b4ba040eb1e7e7274ab9753a28d07059b1d3d30c6b9f2efd35419bac560b856dd8afe45aecd1650ec2"; + sha512 = "01e4fecff221daf211b9ec2b28ff40c6f8077c1bc06509bb78618ae866e26fafb23d060b3a92e397edb47e5fa291ea0a624ea7b51f3a17255ef56c9969dd74e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9406068dabf1382437a42db3da95e16909c768841294b5582091222bc3c81c62775c27865bbf8e0966edf0dad915693fc7b8250aec9a5f1218966564149c18ec"; + sha512 = "c216423e6c6739e2f557b0542f5823e356ca4e494c257a138780f07a27c7173173f3e3a93f5c7e11076ad013d12aad5e4a67dee4845e351a00333e48b34f1edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d4eb83f228582cb2bafdce1427940fe86b3f2de3d66be9df269ac7211f203b19d09ac93be085420883ef89b196ba560627f929a5ad898ddac59a6260fc97dc5f"; + sha512 = "b949fad120650718d99450a5c5a09b0badc7bf142c5c2a37fdbc97039dacacac2f384e3168ad23811356da1c4768bf23c0a3be5bce50a12dd9915b5777c45369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "acb5a7f161fe869084e1ac75c6939b3f9d6ed60512aeb4677646d6dec08b6875092ae7ae403bbcb928fe7377d0c2a94b1cbe701e02dbddbd895bbe44aff5db31"; + sha512 = "aa6ab4f994e4d6049c5d658cbe2b9bf8523fe862c7be632a261caba1a651b12db4e11f160bb18b368234ed8b3c480af7cee1ec7e468551308f4bfdeb6b0a22e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "ff2b2d89336b08eee804ac057cddb5e0891328cb1ef9809357de670fb2d0bee84106f2030afe78972a4343de5f1cecba8e3db1cd7ace38a96a41527b410abdc2"; + sha512 = "cb3fbc1954157236c92f884539b38d369ad718ea9004f3b05c4b70cc4588e25ffed97ad68391ad37713740fdf87966c039ecbae97984d89f01555a492c2debec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "610685ebc89753f4f23b46f84a916c7ecc2e541eaddc41161d34ba04d30a9d896a090f3bf1a1ea192b7c2bee59c3acd552af62ef46e6d79db135cb2cd23bb073"; + sha512 = "9ff1f5706e058f72b8fa57c35cda62e14809bb502e648df00bdb37f899a7e3b46ec34fe4fd556343ff11139cfac1e658076cb3c3132acd6bc447044e04adcccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "46b57a8e73f14ac0ab75c578f948765b672e0f1aaa8c26b299864bf675f636e5e41b0cd62bcc56d67adccef2bced28da29bc3d45d5d78bfe1edbb91ed10bdaec"; + sha512 = "4ab5bf3f84aa8223e24fa3996148ae9fed8fb98b2ba2e7a1e9c035db7521f9590a437e1861cd6e248c63c790163a04fdd87a3eca5a76b9450317ae7c315c9ba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1e07f52ad4ced6963287f873eadbbabf901bfa55910dbf768e32d2887786471ac34322ba12529182e9258d1565b07746393f4b472d4e67f031d59ff40c699143"; + sha512 = "a54194765e1169219f050ff4d3404a45197029b4a7201125764a52c18de109b252c05321e18c2ef33b7478168c36cb3025629c0deef24fd297a4bc8937c51b6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "45af02b4c15440f7d036e3f76c3335629041235511bc6b10eff4d1c1e65e98db3d94ab76724145a45bafc7662fe74efce0b2f192d17bfaccc76d725b89163011"; + sha512 = "10551c3d57167b66b3a5a9368cb8b6c298471a43a8a9b144c5ea82f2dcc111b840e273821a42194bde0c793e1c217f7d39f54ffe907a706823b411c307ea0f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b578a153dedb4a2c522a1b03c8cf6a2b0666c0302977bbe32522bc1967c786ce61280ac5c7e9db74aadae60820faf71047119656450f36ed83a2abf184c18aad"; + sha512 = "cfebbc1438c649a543b5aaecd377a20153917c3f1a07771a3f246c60fe2139f5e3529e26ca507648ffcf062eab301cc3a95f1251df2b586f2f112f9b04aea20f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c01bdcb4fb0c3d492011cafd64e44f5becede34a71168d3b774e6732fdc7cb615a42ccd7710a76e728a1cd874cfe56fcddd57dd7c4d538b05f30e1acc8294d85"; + sha512 = "d2f71c72c5c1aadaa76ed17adbb81c3c72f59407279fb2b4670fc2e21604d8c7eafa0b247b30df3ddf2923f023d6ee3d9d1c36b7033d77b3b7b9f4a37a6656b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c589f7b55591fa412e643c7a3cd51067051302711ecae0a1d9a288e86cb5fa62a06b792a7a0b632e11f937c2bd0ba16738e14783fb2dfa54ea3a8eeeda4697d6"; + sha512 = "03833bb8e39665ddee4cf0163123b52fb7184fc6210622597e7fe2084388a662d380a760bb381609b70679217461fa1c6bf69ea4cdbd872528f7bb0ca2e4500d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb10eeda85968b9454a45850bdb99c25f96baab18f8b797c5bc5fca959126cf61d6ac21017d65169668e1884bb0bb9ec8b6e49c6b3a5cbc8ab917c001dad9573"; + sha512 = "3150fc381b81b4903837fb0b076cee1f425dff20dd449899ccc3b540095d80317727600db4b9abe7607ce7e3d280a86bb730ec665525b2efaa4d72d31ef0ec1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2df553437b2eb792fbbeaed55282c97e56bb613431aaa832dc11748c5e4797e8666cdd9d2e2ad58c95d284c8bf7ae09504ee99b38673b9cbfa99eeb0a1aa6cd8"; + sha512 = "0d144a98d41dd6372d97c8720cb5a7a28d002f26355379bbd1778446a6ff73670d95d5420940634006dc860e585f26118c20a571ec52bce361a2278ab107b495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "50c923efb24cdd29cec576b60d24d6796ae2ba5c747de80228c5eb462e2dabf38b8ff652d2300e82205e1f455a5204e5637a859224c21b6c2235b5249aba399e"; + sha512 = "c609df57bfc5c637c0da9ac1a7418278ba8856bc7b9a283133d6570a3fb99cb9c517a131406dcf01b111a9d69a8624dce34db6e5db73f6bce715b28ecaf2b6b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "21c35afee798548eeb4d0cd6d06c304b642bb023e2a17684d689dbba131301030aefaa66c875f4be80626b628de7235d240c24cb84d171ff6c87368668f85758"; + sha512 = "8e1eeb91b97f93c9ef8ac1ca7020dd05ae89ff4a42849654411f991e483bf64bdd4b8305d2b1de01b5ed2da53ae3136a2cfd3393be1d27cb64c87f6bc52dd840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0c8e1493da42c336a5b10ac353d82d052c8229a61b60b9cdfa234bee50eb3a48fb4f987caf9f66097d9b41a4bd68e8f301d2176c74466cf2cda8e92c63aabb90"; + sha512 = "68deab0e83db3fc69526c0ea86a97fcafc2a87c9ef116c7f8ff54bc78a647dcaae8ac164017d46cfb63248cf0bdc531898dec4d8db883d78fb0ce897fed7614d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "df48a1bb19a27ca16b3e3a5c1193073467fc543a2f9e05ebefeebbc8c9de98b34c0616b5a5b2366bd768d6f8898c42b20427a3582d8d6fdbd5647d58f50af620"; + sha512 = "d48dc92b7bfa0dc0cba2ca5013acc2a5ff4c58eec365b5f80b70b2174624dd94eb199008720c799d5a0a6229e3c2b67a9ba4f93363310de3bb52b62136f3cc3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d85e2dc562e6f47bd169d61716798cece411853f57e777b2ad9349a822680c763a12fb130c851283e4dc9a838cde3c20165124f5d1d3672f897b2da4059ee98e"; + sha512 = "a726dd6c12914e95c7a2707e050fff8e671e2c01e31ca964aa6f32eb89768b7ddd1039d20986baee54a746d67615fa4e4a327219816ae52356b1c6224a149690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "8ac48e7f20342d7d662b163c0bc4452ff8b3d826f12d8fddc3356518c6f4d8bc7eb21935dba982023089823df67956a2eac0a18609c7f455fd91667727c8ad5e"; + sha512 = "f8a0dc9e7e831e72a570bebfefba136e014a27d224537e7eb752a197261b0334cddb28661018c94d41b5c870642288b99d2fca2af3ad64679c7fc41367e8f090"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6f25afef779901e9c61c0c0d8d7596174a0c98e9bef33e78d6f22d20da4e5c0d05196f9d8fa46e71d2f2c049c517a37fa46af2fa52302ac0b67ccc64ff89d820"; + sha512 = "644ccd2c71a2409e840d87a4e9451b454e6223c83f49f398871acbbd3da9f8e1065ba7ff40aa6c81dc7aaee921c4247e462d49649a042e1fb5f79a6fe786782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "74a2fe96d21c7963333209f4907d542165eb6db0e764e66b9b9854b0417cc7b308dcb7b05445d2ea53259e6dd71348439badc210bbb3977f9cab860e337827bb"; + sha512 = "0a439df7d97e4e6dfead990da08f5a62aefb8e8938ae717b64fbe0d0fc83e9e0aede01060a30016a406af6eb91de1c05e10f71fbc4883fe679a9988858b8d488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1b060fef0a070434a94abc728993e2c1203b98886d7ae288b15d32eda082d647c321cd29e38cdbd160fa8123e3661b702d280807761fd46e5666f44861001993"; + sha512 = "8a777c355641cdd14f9b23ed16f139853a7b338dd6d1f66e8c3971cb1a20745ba49aa12bd68ef26e3900b68112333a86988514f91b196127ae7d6e5bc5533770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2f12263c8fd4cedf9969eb25f24e6c211d95a764022eb0c793f25a5e071dcc7faa5c91c91441750ce0ab3f8e76cd317732ff661ea16c1d31e683eab30238b9ae"; + sha512 = "17103974a976021fe921600d8a5fd697d65a8e90a595779be256e2d0350f4f5fcf51f8f16906b3b355b990ba12dab8cc1684a4268a0425e68d3421699618f480"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-x86_64/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "25ac9e23f8f82b6baf9e8dc50361732ac18edb286e6ac673f82c0bd592fe26a61b2a1db012a904f48599fdf62d877f76b10262c0a293f0dc32de148a7417633b"; + sha512 = "904aa9865d7f235cc60176e6dff01fa2842178ba812017cc23011f57baf23089da8feb74cfab15968bddd029ee5f161f10bdd2efead5bea33edc53ee27838052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ach/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0d4648b606e7862db1bd144a68d6bdbd8e926675e58d431ab6dd444eb73b2d5d4bdf7ec83dc3604377166f6ffd2f5ab8e009ac2b64649194f5d3474d101d153"; + sha512 = "6e0076d906a20021a3a161c685404efe584927d39b7e72ea6645a61571c14469b9de07cda7921c24123790fe8f7bfe7b1cf1f644a09f72b86161c3d57be49b7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/af/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c745a2b46f5eb4da7cf10400186913dc69b18284402f491334ab9f335296f60a6781cc09491cab174eb92c6eb6c65f8ab2fc556eaec7dd13be37ef4328084c47"; + sha512 = "a36ba7a0838b00beba5f598281631bc2de5a6cef7399c48c32091cd901abe12356eca4e509e964ba8eb6db011bedce802d060502dcb948de00a57eb754182466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/an/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7aeb7e50e14ac323d68f0ac48fd702be8b3f30b56619b5213498701b4868d90e7ccbe46343cdd0cf950b67f9d51da6413d89445d4ab77f4ec465fb74a1623831"; + sha512 = "262f3a4a7d7007ba22f155e994bd7fc6b69f92efb6932b96e1d07d4a7923b0eb1ca1b4ca60c93e9e1c9feef5c8aba282b4d9af6ad4dc21e8c83cfdc6f4854238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ar/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "177da0fb662a99226889d4ad063b5af18f1cf8816a685d60c767b90dc2db0c460bd62c239d3045bae92bd1f4df129337e278bf95d5db103cbb6028ccf869c070"; + sha512 = "6fc5c1e07b4d31e8f5cb21f325e282875ed481de67168b43506c5083741c117d690cf681400778d96b291dc925aa6fd866645bbbe5cd477c1c7254cecc940bb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/as/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "dcfd4127df6b3f0d0ceef142c209223e7ef74e5fdc971072d6d43d5db1545b7d9f155185752688168bc1e461fb201d3d01246dd3c18ae006304144771f555483"; + sha512 = "381032696886a2839d927c81abf0bfb48452ab2da37a57290e2f50daeba947fc17fa8bc8e95461f981980bf67cdbd022c7fbbf17cf631f27555fc92174c1c4f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ast/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ec31d580e6b8e5ae6e06e1a713a42f3712fc3253d64cff1a1c957211cd01ee09929643e0a8637bd11d51283cd99ad46e26568ae6cbcc4812720ec1ddb48832d5"; + sha512 = "5eecf58f91ad77de3f9c4afe211138c79aed460d35f0b4f1a7297b27f72400355e0c1ade4fb2c457ae26d8da114ad711c3c0b2a374e5ba6bc33d107c28b3c3aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/az/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e053d3b208023d799beb3be82944e9fe6b3ab8bee83e6e0a39f2e0739c77aa267d80096557e191d9b0dadad385ccdd55256ba875fa3bcca4cc3a850a1acf6908"; + sha512 = "de90f1e9d1950d1f194d0c5da3bc25bba00da5dd4094c6944b035aa660cd56827183714d9dcc8bb9e7ea4c115792bfb969a218034fc743fe85b65921838db610"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/be/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1e6f1e36a0b48994026da658cefa8cfde0f1f2c0eee66fb14c7f7beb18a485eaf14c47d22c4586659399dde7c6e352d8ecf4d3ebb3393ea3dd2c3796a4b69b2f"; + sha512 = "f043a6e2c6499aac4c9b2df0ac0c2d62207a79a34eb727668a42942a4a4027ff545484212c88c0fcd9ab91c66921daa3846c294bc3260db3a0f8f35dc9a8c2cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bg/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "68ba57eece50ece15eb6856593dc09496e2e120c76dc21d7dd0b00eddb8a15308cbee2e42995b530024fb0934323a7a0437c2bf5b5a6a9de22105abd023b04bc"; + sha512 = "cdad058ee575bf2b4acfd3882769b067959ab8215b351add7558d8a6b6898fdce951db35e23e18c7e7d3fec170a78cf71bf61d20c4ef3c42c23a96e66686f59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-BD/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "96f300f3ce1920260426bae867f53a2bdca2fab085bd6f47e39f804ab298df1301ec58666a849e3c2d718c57ebd0c3bd5dc5da3e80884958dd4b4ec2287ce86a"; + sha512 = "ac4e823c753a7b765f1bee0cfc8cc0fb216b5b9e70e147866100d4b90fab0b413850ed15f02585170c3a6dc39b4fd5e7906547626379a70d5d5abe67eac0956c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bn-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "887638fdcd191d2c073a4a5b7c3989b47af586a912864d0adac7b00c062ce6699a579e7362862c2f98d29c088db2e85e41f724939d04c1e496f1e48bacb76efb"; + sha512 = "15b12cb32ea9be780dcc68ce75d54afbd16c011fee06a15130e2d1844746ac2cc66dd61397facb083c478f4a754385afc62fe4355442aad31e8ca87dd5270fc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/br/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c8b1391f54fb128a59ce1b0d4e506b27510e1c117d0f0044b67cea248ab82014e8f64d937f4c703a39d3603d8341f34d36e650ecc3a8dc10002943187545b77b"; + sha512 = "493c260aca10b349b860492b5756814868520f79dc9853745af8e1989f645f2eb17446af9bb5309d21fc79d9139c7e7560dc5a5a1753bfc32ab3df07e5fe729e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/bs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b7d89d6ff57f44c61693991eb67f0ee30a8e8daf0935be51a3ef5953e38ad3706bf16ca13e344038016a77fdae7566796f60a285304ab14638264449c25780d2"; + sha512 = "ea865333358b245703fbbaaf621ebab603aa9db3a7c579e244f229696ed1c7176ed44158de6a01817cd410576e69c354d2091704af8dc30b4eed2b2f2f3a0629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ca/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ee829172889a002199f07ac806d512f9753b565fa992931039cffce764ae53495446cc55b3a1b3c68a805cee09db1249e06296b847928cda9773bc0d670d4445"; + sha512 = "0961c13ae053299c8f0e0c1d704c0825215c1e77b43abd83ba86709448f22e6ee40c6a1b8d858e4f2d801d7c024b293631ab28ae9fa30553790187896a96da1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cak/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8bfd9a39d151410dac0e2479e3918d74604cf9773db63d077281aa94d29db102c14ec86fe24d00187a0a790e4bc2beb8af467fda205d69c5b3c918c22b7327a5"; + sha512 = "3a8dc71fc212a35f83d10ecfc8c8f97381699431964d34fa7a278259b1cdd15b4e92fef33cc9c1f37868baff0f6ff1064599ba632ad718ae2d39dd3b044f758f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cs/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c6fcbbaeeb39f1a842045b9a919fced5dfc5e13aa760504599a376692c7b84254365d50e4cc02af5d5bae378c8503dc02f755a8594eeff0e78c79726b44422d6"; + sha512 = "eecb76deb0c420790a37ef24c0956574a4a881cc429f8f78d6ee207b4b9f6c12b8c890e6ebd4f69e9cf4ba120728a319ffba6f90a3eb42affac86fd27dc015d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/cy/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e404cd8e0f699ff3a09f398ca29800739afd23e5a0ef6299ec47c65771de295d2f071454111fc3596eb77656ff92cba088620084f41e21e4e2a44706957a23c0"; + sha512 = "7ca940188627a439f3a3e401075e3dfec2c4082eaa8aa65fc7a58bc669f4e4a4835095225bcba541c3cc8562dc611fefc4a7e1f7089a8d291b4986d557901cb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/da/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e9902fbad8c46b156f3331c7578a8223ed8b167db7e83333bb57fcd292fc2010fc1be16cdffb611238e0d2a310c6cb25f11317c100ecd5ba140d86890ba563b3"; + sha512 = "366f786e96bbd5c4eb1ae247e2cbe567a7e94b76124a2a78062528daf1aa72236c91aeb2213f623a8214fadb920d10f1ec49a8bdad4a5a855ca23f06665d68dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/de/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0ed09f934f6d9b862ccf8dad186d510d380f9fa9afcdaf3093badee786c17db3d7baa1061370f4c505af10b4541af2fe368e9fe5a274778e54128999bd88c585"; + sha512 = "43d46c88a8d58f36ebc832afd6b03eea5afaa58bd3eacde85eed36725f248529169f6d396a3580b2d9483d36bdcae3dd9ad53cc1aa69264231b53285915e3d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/dsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c126ae75872980e5172b5b47813643ad9ea7d1d9e78e15aeea6bf0e4701ec21c83715a5313d570d121dd184751b8c7a0bee708f628ec2bd470c781719707f1e6"; + sha512 = "16006a1e4ac7662e9d343cf31dae5d3032948a90a7eab1bf1122ea2f45b4f3477c53d8f0fbfb860e4725cb3a58678890c5de186ecc0cb76106153edefb011eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/el/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5560e090a6c9a1d0b48fc16d983fc9c5321137202826cc14cdd6dccffbcaf202724eb2629162fa7ed8acb0537c8839a904df69778a0dd77b2caf78976fb9de80"; + sha512 = "d5f74e30fc7da9c9765bbdff4f946ef5de3c64ae4626833d31161e62de106485f9246efe0b1866d47c52ba7d236880c648a438e1602f0552774573c76e2c79bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-GB/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "85ad619fa280092dd6674a35e95e07d6f590be9d26dfb48249092d5687c06770854d83c09e36ba22a4c8d1dd8bfdef104276c6a761ca3d26d5b1acc104c8e5ac"; + sha512 = "4a6ebf46697c02c9a3953cfee25d761254cc79b12a88a049b8477806b3d1cd978e46295124e7afb3770b7d4c01bd2e002e1e8a092ddf252f6c22f6f9afb4c9c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-US/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "db935918745a225db24499444723443437d1c68f17a83c7e524620328872f58d702ce6e16f7f0e641e7f67a53846804f5d49ba324ed66905ae4f019256225053"; + sha512 = "f5f1af68ea08cc95b449595d9f15f346a8562e4c27529bba6453b0fb713d65d1b4cfb66c9054f25d8a8b6aa2d7029592a7d00a2a68ee5c2fa8cb7d06174f9f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/en-ZA/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "0dd3ef914cd5ff9ed64e475f8881bc6b0897193771f9faf0429105c21d5dface47f643c298dea8d539ed1f362b59a4f15d3097e623063f49968dd5aadaef35eb"; + sha512 = "554221102e16a5ed426afc41b75be680a6d28012bb66a12c094a719c7d7ea61d0ea378a3eab758b907ad407de78063888b687cab8ef5dabe19f3a54d2bc722ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eo/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "0d85aec2cbce71e7dd30808df937bcae92f806dcb41e6e22283add504333538561deb7377454946e61ee9ce8e2366cc0be926f5d6f032f3f09fb6183eeaa7d3d"; + sha512 = "bb31a3422a0d86970649485bad7f78588653ee91551fda7babc9214e9855e7a363eb010ddcfe6d353e292410421bf99c2fcde0aef4113b688dfd3843d1f0377d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-AR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6b0d3bfbb399d444b18d42c8dede4c9f8adea846fe89931112eca0196fc2bf924e767d849d37a1ab599e27a39c02403d5df15bfd814fae91d2aa4094723ddbb2"; + sha512 = "a47626bef5d9cc8df045d0a38350f0470f5426f4de8ef45bbcb6a60922532656f60f4fa41c4ef4706af82e5c099af5d5020e6d51ee1d61f8275eced5935ec2d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-CL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "accee76187bd35e36b282f6187ab6ef93399e1d703b29c3c60deea9572c28c00f2430b26a5b94d9d894b9ade20e547a1330a68f0e5f05c433b20a0e969f3bff4"; + sha512 = "cd93d2b921c3fbadd2862f0fd8d1cc628bf5da469d86bcf619c35940560024bf9b461b2fb405a2fde39e7910b6c0367e31e44c8217971f9a82391dfa5a869094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-ES/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "471326ae89d980943c8a2f110c57352c0e1498f131454d019ef1a3ff63414649a9a2d894a114a802c508db1117b95b7f09a0e5296633f6be8c3fe5bc140aadaa"; + sha512 = "1c911d2898749ab249ddbf7747b7cabda4a33a2b4e426c88aef71055b8483e0e9b408511a14b400ee332358f2e92d3a83817cdb73d8edb9b85ada94538f1bffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/es-MX/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c6af789d6db42cbab5b1524d35cdfc781ae4e836c81aa98eaba72c43b8aaee2e8eea1383c1be71e6816cca1278bc7d6809bbbb2503625e682d4a2ca00f509c71"; + sha512 = "bc7aebfaefba4a4df95d1c60a85b6f961e0bf0a31249caedfd0653f1c1bcdc3f7c27c6f52f45b7cdcca54562a556bf99581e79ecfee9488094327af69b909c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/et/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c72c23482222ee411f0781d5a3c93561d2b8234e7797570dfda0b69e92f7593b1ce7083676be8d8fa720f2b05d6cd052be2202782a7fb72fc30b85fd742df45b"; + sha512 = "b1871f409cb4a9b1b85215e49ab4620fdd7eeb3db11e5a0145dd40a923ee4192ab6ddd8aaac82c1d28153722973a15c1fe80c822075dfa4baf50204228ea3db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/eu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "2a6718e8f2d3803e61169813fcef9d016b672f7f8358ece119ae71b2535f3933d032bf133e1c36305cf7e02bc94c53d1ab8998f53aeb775c3056b8449ad971d7"; + sha512 = "f3bf362364479ea07a0c681d79987f9c80c9e3c06a54eb82a0c0308ad195aef257845e73f72f86dfb45ec36551c9a6afa9b32958c28066e626ca33e2c3c8d628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fa/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c0980b33767e2bc99a42741b9d35d2b7841a637975759731bc9c8be6a34932a01006453e19e487fa06f37ad9dd97d4b3fcc9563f4a6dcf8998576db5262df999"; + sha512 = "f7976eeb893f7fa4cf51b2ebb3c6442e731f4a96a2d833d532dbda87412789f044491b3239a7302972664c17dc08606648b011263d63e01e7a51e430ca1f243a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ff/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "5e6aafab13381f2c5c4f26dbd3bdb56296b3d92e9f9b9989f09adf1163edb587eacac2a63a9fc1283dc0ce9620fde08af50ac4558faace09675f6256523329ef"; + sha512 = "6381ad86b9ccb65b4aae7359554a49cf630e8f898cca26479b327e9bb14695f87f566da9bd8a31af05c9781fee65dfaa8e23cd0588e4441ce6fb8fb25f7d7fa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "94b3734bff09df66782f2cda93015be2d8f7ba90cadc272560ff232b8c01612cc733476ab3f6b3e27f52625102684ac11ecf58571a11f06806abadcf1c1e95f3"; + sha512 = "1a80fef046318667a0306cd8870e697ab246df3f1ff7fba30ef3a24c25551b2e265e6b52a13514fe216dc5bbf237df7f04106bca87e0506a53caad9856c1c426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f4f9202c458171026c5770b3b471882df609dc029313b0914856e445dbed38da598bd96291a44dfeafb0dda82adb4ead3b9e5443e1493b8d861b11b1cdd92480"; + sha512 = "26b25a2fdb514cca9638748ec8481f7c36e38f1d3953cd5a45025861145d7851a4441b2a2a472f07620c170864a278dffad3e2d625a31cefc0c348cdfb3ff4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/fy-NL/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "72c71addde606c99df99f0b405f61e0b1cbebb10cc1a9467a3dce9092d3c17fc76fa8a737f8140db00fb03da513751b7518e7521fbff2ff36b4df36a8fbf1ee9"; + sha512 = "d0a322d815f08e4cb1b7f49de22dd21401e1871b13272ef33f4e311f52436e97f863943511190b0dd2bb3c99ddc0a0b8acf95740e367a34bd78be3425af6e3bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ga-IE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1b23e5ccb911a0a683e356c413fb1c2b853e9e14c3415c0c11da72939107d4294f9f3abc579e2da7de613c32c65a4e8d6e05e6d7d65076619d18dcb38056ec86"; + sha512 = "a736609a8a10782273b79a83cee0929bd2d82958edf6e266245c1a4631c4d4656b128789779806d6c9500f914c749beeac52df3c6c85e149f5357f182603f878"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gd/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "59b0ab5d6a04f2d9cc818b7184ec727d95cdf061095111878af58448739481f94e98d7818647d03a302815ea77e0832471ff072c6caa106227849eba56de75ab"; + sha512 = "66e110faabe9a6ee1cc3aad8e471301aa636e00f3c7cd01d49b3aac5dc96ff117aca8c4b0dc2a7d23a8122bbcb152d82200a505a9e534c9a9dc93da8237afa13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "36c45ed8de93cda743a5d054f3273db4878ce2ecc9d78cdabba4be93f2e466e111a344a05977cfa52b52ee905b0d053b5f509bde6e2e26f14a3391b37eb054af"; + sha512 = "5b115d289497efd2c706bdd2f6337b6f3afb57f4fd95178b7a5953b92a5191dbdbdda54fa3324dab23661c49bd5c8992bb1e2bf6afd12dd6e61ccb2900e53d98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d658ab947e261a3eac0ffcd9f4d56eba634bb964799202e3717f5c41936e64de5523ab16b8b35daba1de7c625c8eb31101596fc73056065e4f8bcc8af8de1197"; + sha512 = "357bb746ad1f10118e13f439ae58052fb93bf89562eab0f78510c027f24276849df4a69789db6b274a66b5232c4a6794f2d3daf3a3ff35644b8ce1f137febd2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/gu-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "9faf44b19f5730dd09fd32b3109249cade91fe4c464dada869e11211bf7d3c2039c65bfe4729c488ed53159a08cec5250e7c2fb55139a8af3a40b1cba40413e0"; + sha512 = "ee4af8b2880c16c55f09d9c2385502ef4b099854c123cb6d148df1d2024e267d7ef9b0ebd8f1b70449698dd3b25be8479c932dc27cccd38d8086d4ffb7c3bdb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/he/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0cc925fd0f9d2d89c49a195e4f568f5c9f570175f31f86154cff6875860bc11db0103508f5985d073dc7c37c9ab5fffc6f50b94e47a3f47f7fa02678f4afc33b"; + sha512 = "d937ec20e10ce471f658717310b6d361df800eecf54b81156e412c0af1d98efffc33534492c46fbd600f9e5a4d85e0bcd80fc7f711b22b7eebf7182e78e05abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hi-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "934c1a6d4f148fc2d87b2ff2be5a4a31ed463caaba84b9330f0cf8e7bc56630665ef4566f03bd8f7da5111400ede564ce8d4cf14a4a34c48877aa710962f3798"; + sha512 = "39d55bfe0d78884fc6f27ddbabc3f80e3075ffb027e656ad07cc56fe39cf097f3c3cc501d123abd172c1d4116bd8fb8bb620a2af8a8ac5c48bba5225cdba58dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "65c92cbe069e7b67be5b092c070741490a5fc409fd3d0e8a03e7346702398ce717f45e80c909851a4699cbea218a5e7a49049429fc54d850ccb28b23382681ca"; + sha512 = "aef7a38ccc9ca3a98249bd4d325ec01dd8e12e7b95b9bddd5183bf8b4795f283f8cfc6c87f22e38647fe58c00d40e95e65e1994a21910f3661937042732f0c14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hsb/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "27df62d51e97a63beecf1d842280ada91619f18372679b25580f9248dcff5a45c19d64b2c2912f0daaf9c5169cc3c8f58ca5e7dfd360b292dd88d8dfe1b428dd"; + sha512 = "daffc6eadeb9376b42fba1c96b759b3dfef0bbace76472df11b56fd3bcf47d05f85f58affcba193aad39bd58d194b72da32ed5ab7a7d9376adcd17c50d19836e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hu/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1b84d77cf561041ce0b0213111b5830cd95e40dbd447e16b23bf93d241f0dd9cb5510c29ecaad63dd3818f6a8f6070eb8314af28311deb012d3e8f4ca2390da9"; + sha512 = "bdeef0f11f48cff94a0a80033e2e6f63c12130729ab0af7e0ce7133871282a911936b7c1365319495235ee4336cf2683a84995dc05d424ab70f89553ac8d39d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/hy-AM/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "691d45d0ac7c8db9da1f73fb466eabe56d1a70e7fe08293fc6ad95e5df1da461593e89bb06122fe4a29395f75f2cb6a1abb568ca798130f9b4d03795eb8b165f"; + sha512 = "2d20876ba70cbbaf66f0f6653ca284f3472511377e9b4cbfc087b763fc96e1343fb4da014523b24731fee709d1d407596b01cf531b390d1c2f3ff5e47c3d3347"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/id/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1592365d75275ed597342602625a591b2fd31d204c39a68dc216fd353d317d811e17549b73486de9a001015fe415c918b1057a7f85093906a9fc612b8eaddc34"; + sha512 = "09305a81fcd0400239192fcfce0369ed49dd5eb2e014ea1bc12c1470b732e6aea3580d1d34285848e7c12f5017d321e29ea27705cb298fc147abb82d089ad6e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/is/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b7f33d0d15e2c6b53d0f43feb767967e49288e5b108f18de9a74acf289dc56f0c4b477594de02eed7402150f8df77d1194f140ed64c99a6ce7749b32dbf91ca5"; + sha512 = "4151a950e6a4fe8a4c9c143ac47714e35d45639a00a3c03c21c7cb974aab46b56b69b4357ce2294abaa84df6b3c561708b74f5d8fc4139221a89d744689d531e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/it/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d96117f473e639863766280a59ea5c944cf916ab7c796eb59d0701ff5096d0efd93ec49c1d790eb3e16db139e3ad482fc7be2a6c214104874030a16eeb882629"; + sha512 = "3d776b488104b99992e718b2a41c8de09438140143de61625f01ce51cc8461fcc564da883510dd29c854bb181e906b095347c5b34d5b1964ed51c268469842dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ja/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a535bc29f4f97e223716dc7d3eca6dc3cb8e04fa79c0a3880d116275ef6eec41a9458007a33fbe527c664aec9fdac24d56db04c8547c93fcbcbf33fd461ce217"; + sha512 = "2b0adf6bb4f4729ffa7a4e20e5c5b4973032a4416076cfbd5d1c9d0ca551a8a1ccb0fcbe1998bfa390373ecbb7d74faf163fef47c20d1f2b4d179a9a0f802957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ka/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3bfc8c1b414bf8f38caf7f29342024a09d56c34fb66ff2bde2ea953ea2f22891d85a014e6ff767dc895d692b45927ff45b63277dfaa72c8f90e78ca172daf4c5"; + sha512 = "50b718fea376c16b586f1c54012e6215eea03391d2bdbf1227629d5aafdbd864cdcb3e9527fd2e4fe1486bf928392d7cd70ac147f1b35d626ba7072066cb8737"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kab/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ec3672acb496fa5e19f148ceab4950f05286f73dc1a00ed41388f14ac8945ca23b9c2d64f50826a49e2874b51b7b9fa61f8c345e968f77461d9daf9e8f616c8d"; + sha512 = "ac3490642bfe48817d992706d441009ace6866ddcf38ee71b172eeacc3e7b3fe44d433b15fa9bfe238690078950514f7d5aa5c2ae7239e3698c04c71f725508b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "659663a9d889f31384e8734728de5ac7b0902587360a8da0ca596034d0f2f4a886d5c46a99a0103a9899f30078e384c1389886db8db5a657659d512fff8763a9"; + sha512 = "62a6f73528c26264525fa2fb4e1c0a8e1f029c74eb5333c5912ef208146d24e2ce2e037e904bf83fb3f7c10fc81f969586a09c5cc3746213454f206fd6c1286d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/km/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7c0e9cc3644bf38d042da7ce5ecc4d2c533c6215919def5be6a993daf7eba0f10a70f571361d0ccaa989e6a2abe3a273ea56099cff5bd47e0a6536066f23c824"; + sha512 = "4dee68ffd5f306edc3e49321bb29edf435e7924371c37a2e1e239a1377e0f9be5cd6ee680aeba46465ebde9f8b090d467e93b0c65e75c9627413c5ff7c720589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/kn/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "150fcc5ba1aa0d9afb4ecb0ce9dda85a404c5aebabef5f0e3c00ea2fadfde52593a466c3582fe7545dcdd28fade62dd5947b7aff473b3d6e7060be67a78ecae6"; + sha512 = "b0fc37707804ca6cad153528275076ad64b64685c2c34bebe27ce652c7385cef455da75420f0e8c543aaf20bc1358e080cce48b747a23c08b9c72b1f7640d0c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ko/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2e48ab21047dc311ab8db94ebe60c04b7bd61da5b56f39d56d6c7745efbe4d64f1ea54c370d197ca4c0bfada9a94afb96a33132b81148c18d8e69b31f0440108"; + sha512 = "26534fd7779e1c29e2937399a4a79690fdafd8fe7aa735d4386fbb03d9e7be09ae83a3fb3d9c2691bbebe40f8f73ee18db24133ac4250b787a8e13263bc1ea2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lij/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6410f7bc134698e71dd8785885c470987afdb2d75ca5c0f49ea70c2cb0f4d1b1f93397b6974000082609b8d7007f304f917f9a3dc8d713f13968190b43a0f4e5"; + sha512 = "2b42d3afa649bb48d3bef4d67f01fcae216f28d3d912ba096258ad1992914d99c8389abba60128e0198a8ea54ccd87239d857e29b44b297eecc288a08553a6ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lt/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "78e6f46015aeb56575c0c508f572fce65d1caa8af288d1db0dd157c54ecefcb821338f39e2c47021a4ec3be7c2bae0ebaa08c035d3755bc32e074a7ea87d7f9e"; + sha512 = "ab7194527b65667938ba7e4dabce6ef67c075284b1795fa064a81e1970ff71e1d4e60687e202fb82ea4663f46dd4ebdfb0c7ae30734dbd5662c28499484618a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/lv/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1972a6030332a571ae67b7856cff277101614b8e7d8f82dc204bf45a3a4838a214d00e23972cda731931f4dc202388896da6ffbb8c508cd4be45694ef1d934c8"; + sha512 = "33d3fc939a464389fdb0345cd92c29a1c38e4418fa293d131f7bafd2f39444068ae7c168881076b9392019d77c5260ee670bf7131d9501127095441e43e7353b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mai/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "269841cbfa1b70b070cc619beeca5c4cb9c03a9d0643f5d1d95661e12153c66cdbd8f92807352ea9ddfd438cac8fc7da170c467a8f6712e1e00b152dfcaf15c9"; + sha512 = "69816c5d46e84d0dd4b5fb1473e49875725ff4dce7d08c9a892f4119f6aabed29e30789a77a56585e2399918aea16a84dc94d3d9e04d3e29b85e1ecfd4289a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "948135fd1a957eb5b1f4731d684f37b0e7fb78d2861e5be55ee23fb03484cf59f2e66543aed1764fb66b69d4779e39dc0c5104f52feeceb602285bf4b6e46d09"; + sha512 = "93e41429afa3095ec8cd903f7c942ac46b65a39566c7bffaea937b2ad72d219d755fec27d58e351cd70cd697149433b43f26753b389f8f70ddcac9ba9fab78f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ml/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "db7eb47a5d357a67b5522361cabd690455eb17d25a9de290c79885fb3a0334a5149eac03e92af9e0dbb25fafb18dab73dc49ad0f0ef7451e7f1ec360bfd6ca4d"; + sha512 = "911e36c834c35664b38c14748f146499bc74217ab7ab6dc3c318df8dc115bf8a5f09ab24f3c650f01d664b85e9edb90b2515f4f4d413fe2c0663a3ec4714df1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/mr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a416334034eb327d9affb8eef3331fb9627d4eed9b680c312bb4adb1ea64438f95b89117ad1db8ba1e8e8f2d5408668bc7ff6e1cd2b241641221cf591eb847ad"; + sha512 = "8ea055ece43abe41c21b726df13587f86987b6a836055fc3bc525adc04e5d360db2e3b5104587546f3192868cc10b02fdf08540644e1d5ccc03e963920220286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ms/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2c486e99e052065705c3f49f743e703a1cd49083b08df6170c58eb1155a1a30c56418263adef4acd4677a0a812c9682a87d470ef0e0907057bb14ec10447f36a"; + sha512 = "b3da22c39ba71e28fe6c5f36cf5b99d63014e68f5a1cae4dfe94846393321a15188358e4cda263f4fab2c2c578c78739e3338345d2e7b761286836db435df868"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/my/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "31718e334380c9937aa8003d3586931de21bf0ced0b28db57baab82d2e0328e64c1b390676ae4949c622544918aae727e925ddba04abb97b756f601ad22c13fe"; + sha512 = "4ad4201d56fcacd6c238a3b60a36238cf5c635f7fa601ab4342516e7860e2966b449113632c9b1047f1721d31e211a67987bc2ef5a439db9cc09ab437afff2ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nb-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "051209a5d65615732d7353e24a500dabd3cfa4a3f5f8dd4ef61c1d4a11236cbf59915fe3ae14cd7c524898f01bfc40f1565ecbe6998b9061657db4a330eb6a28"; + sha512 = "f167d00296e36ea498df7b331a48161d613cc395c16cd63b83580933a776829cf492213158c22eec1e6df9f2dd1a811ced289046ba404e40230bef5ca28bd4b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ea61e410ce32be3bb5c9bcc2463ca1eb6855b18c1b6511cda81b4203d86e1cce6d01329d60ee60b96340f9d6abe17e2ed567c5a7cb96797ba88525404b5dcb5a"; + sha512 = "b53257382aa247d4b6745b0abfbc25c1c015f2c770f5ff2bb619e208ccbc4b499d2a60c9b9ce5d345dd65517a41f6cc4041d948ec8af5a43ebef417efeb91505"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/nn-NO/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "db9c3a1ee0630afded4ec215880050973dbeb2bb98995743497f01c79f90c1609846f4dc03f6f1da4b1274b23f95ce69f4ad6de0f2f94acf10df21615d00532e"; + sha512 = "b7b50ef1127a07a4bf7aaf3c5e3eb2621c502e660528841dc92c4a937b78aea003fd6eba763374990563a63774e0041893ef952f02a387b4c2916b5a3c18fcc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/or/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "9d8408c76a2dd72273827f0fce70b3346a910ee73df52b1c5129bcd6e79d7b768d311f5ce4b4867af5a32d6491b75f816793ccbc3da6e0d7ba2f06a7e2386d30"; + sha512 = "ba55767451edc408b92d21fc74133a13151c5f1faa532dba0bb27d8ed79f73aebbd76c3acddd2b689023b649665f4b70f72a9495805ffa8de888bb35c1898e78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pa-IN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fabf259bb80a312ab1ed6997f7c2b605e5c19fc87adff388fa8188181038d1ba719075a23cc4195efca5c8ed4f8066277b2db0b581d10f64f1d6d206b29a624f"; + sha512 = "97babdc8ea4541d2a2fe07b0c258d636329a03643ff411c1ed752ec949946b6459f7fd21ddd2a688653f788e30fc166c381dbfef238c0437ce276a0fca80323e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "35b31f5c5979ff0e30f52d3012db119abac393fb6948ae930e8efc17047235b06bc6bb0a2546677c943933a600e04d037e443b6c225893082802d5d876f900ee"; + sha512 = "733b22d43c15bc0eba1918a3177654b0742d480bb8891f3ed817c7dcc70e084feb505b6b1c12fed103b73136a74138771fb3a23a0018786cd4cf16f9b745c281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-BR/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cb118f08e74101373a3d1f586b5b7ed47d9f4bdd89e922ca430a92797e3cb141bc847b827b579412487ef5d8bd1ad933656db9929a14a91512af61d23b897a2d"; + sha512 = "fff3d62b5d85448f8ae5ad30deff720912a5d8efa5838d908a68d97b3bce84164df57f387068b0e10b51469c5bbec9cbb1602279d0937f6cd211072a1222c8a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/pt-PT/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b561940da41b9d88819d7a86402d0b5973950f2d90789540c2be6a0b1981e80f2e2d163dc1b2d0a1e1e0fdbcef9927223b2d85b364126ec894e6f715d054956e"; + sha512 = "c49d00cf50d5e6cc8c46e43aa2ef7879c7cdd92783a6834fce58450c8c93553062af060995a2fa8d3e9b5c288fed3522704213d482b60014091569bf12815f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/rm/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "41ed27048f63ff77be3ec90144e94ef5a7ec846e88c1d90729cb00518eb1f9de5fd3e94975ab49954aab98850e8930b97f59bc6c1bff8b69520e81d94bed46ba"; + sha512 = "5a5e383a1e8f95f938b12ae6509076c595709c737a02f8ca40838e638ecc79112aa25c9277086d13c6d7a00d6bc316c809273c8157cf7970c8b4481c5fd7ca4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ro/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c5c2359a7f183ddd7275b64ccd3a7f8fa48435d8595db1b7f388e557f02669c12aaa746756fe77ebbd83496d36cec3cfeaa8baf6dc8eeb731af1ad970ff0e325"; + sha512 = "48392338e19fe9bd0b0094b0247e9d9272fc6ca518e1fadfe628e9607d2e1aa2db9e11895fc835dd4cc1bb6e196960afe601354a24885a3ddeef211f2632af04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ru/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1711a76df67b6ba5bfcac6015d92cdd5fa51643e3955487fc6df6176840ab910aec593b6bb041e2ad0259bd45d8aa0da7a6ef75bbdd38b0821b2524ea7de9452"; + sha512 = "6543a2002291a87f91d224d223a8f292da4f8137b5916db7bb6d2182fbc23b3047133d3cce311275938317bc85ca992d3158d845797509ebdb765c4db76a5324"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/si/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "57c49bab469d7b17c6f9d79003b52a778c40d5dfb27cc238168809041aff849c843cc6442b1dba1503a6e89f1f2168ed191e0256aceb38fe990f9806bd4f2870"; + sha512 = "1aa8bb875f28bbb99c8ba228485e612f8eb2d449d6518cb88268ae8cf31b572762353a210ad532ac9328bc5266b2710946aebbc39070ed98df633ad5b15ee589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "be5dce90f29f97c0670531b58d3199e22e2638169d2deb62e9ac2c294d7ee768445e47661e7b4bef40b0e9dd6d526581b072f808c005722f9640d980a5a1da1f"; + sha512 = "ef926b5a984d0f2027cebb405fd48486f1a79595f16f26f74a2f13083453ce5b94e5b123c959101e8b63a9af558f816a2af806cc9f2c87b9f2c3278369e52411"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sl/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7dd6e621e4ca75d22d97ffb7649223eb31785d140058ac9d245f76e45d8c0fb85c7cc3da0b47fbf678e014e5a81c162df80a9e2d9c9700f9121cd9bfd49c7be3"; + sha512 = "1447deb0e0d97e1a06d795cf66c604301b0c88fb248e96dcee23ffe6954effe11c12bb41706728c4b69f0f807b9f8e7aba6c9535b779a701ce41fbf26cd6a3c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/son/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "00963fcbfd0fe449387c4b2bd7106df566641454b1988eed3f5a9ff285793c6fe9777b23836b2fb7b5ed6db2cfd4219b8cdcbd67339b453e6ed0fc7534547f29"; + sha512 = "94c4c28b782268f37601188013957d95fda818d56b242bcd9d4575a787f4aca057c5970bafeebd31a6f31dfc72dd48c07b50fcc20d70ed9926e280b23661ec84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sq/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5a5e2531c75c4f120babe6ef575939b29e5b49363cf2788a14440e628009f7a2d32911b1ba16f88b55e85af8eb754aed0790471efdd834c1ab0bfff827b86b99"; + sha512 = "7fb22a303bb016c37322bbbc3d4170b96d54cdac6e1ce61e48dabd868800b01009263ad69052d919823eb2c104ca41ebadebd00808c581c7eebbd3e82e2ff810"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5b35e346cb017076a5ddde6a9a4a3a8de572e6799e194fa6ea358ce50a8df22f8ca5bbb316b4f17a8ea5260fd3e025af00f7c362263f84efe64254f1977c8d78"; + sha512 = "991f3c6aeb48db23a4a569a5f51f22aebaa60b5ed6da149818c2a01dd40256eaebecc738e8623d3662ee9633e04581c4c4033461ac23694f81360e980b2ab406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/sv-SE/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6f52f537acd049e0602028fc1a852bb4a5adaa0649cb85a4361011e544f08ba5e1ad5917abc9a405a30f4fbf9eaf0acab1aaaabfddb4d5e1b4d030a600052bc6"; + sha512 = "381667c64722d04fb102d3d1deee0c13805d4271adb801b5176b9fe842c3916a4ae926dc56256552cc309729e5a0a16d82188b79210c4901e8c4f6d4e2930260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ta/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a24286bccc8408833d689549e59792d12e16d985a0eb0eab386a2c220f5d01f9bcbef6862d7115154586fbf711df08fca0383978793d5d672c196e17a82830a3"; + sha512 = "099d94a7f35bb7a6c59e34c0ea500ca4f98a473ee52b3e33e10a085693d09ad0904c4dff4097b0d80cfd43f31cf9e05e300c40482aaecb83ee59d6fdb21d20fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/te/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0e16d70eeb4f89ae7d02326053f1be58768213f4c50e60b4160e54b79b2b80beef8c2d161190b3276350b7b47dbfe44bc59e63bc95e9b0ad08491a0876574f06"; + sha512 = "506c2538ed1a421631f9492894941ecd022ac3f085673c1447bac8f7c52c7dbe91854ff76efc7964f875444fdb83b54bbabf5c96f217cac6f61107af3ec65545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/th/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1145d91d10339ec6fe757f366d59568f76b1ade1be456547dc80719a85dc8bdf4e5f1be943335496c489891c3f18cefd9bf83ce2239a25890ba7de8981400319"; + sha512 = "61ee3a8271478647e2d957e5a8304d88a68438043f6ffdb006c5935700856f7fb16d9ffe65785fde03926743c4c5713bde934383887d81d7e684ae6da14e8776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/tr/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "60031ede41569676d339df3abdc391c581ab01d4feed901346e77b33fc8d441bf501c521344caabc3dc59b6b537f8ef3f3edc0ec32f94b1c5386730b4b17b29d"; + sha512 = "2204991ea8ff6f06bf9a4aa9de2f395fc7cb88fcbb837476c5dbe2556cfcbcf361934f840b293e09d11e33427d22cd8fec44821779ee671a19e0aa577d9bb2cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uk/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7c0554464057c27ac32ed1fea09a7bb05e5008b84ff5c1db0029a32fa7df0d4b5a47df7928bd138c8a8285c4a3146b8eb77b349c4352ca6b87ee8e804aba36f5"; + sha512 = "d550a3637e8a135b750e0932be53b40adcd2b17073a08dee6d02357b679a088d04f8ca1ddee41cd6370da2d611fe4981a70b2f38caf7e8a5bf1145ce94923307"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/ur/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7f504ebcd65f30b2aa5fec962498457abb48a77fcbe5e9b50290500f7a78cc2cd8ede0395529d2edc081124fc980c85d37628529f10ab011f70eb40c9533385d"; + sha512 = "606f376a7fbfce145cc911fa126b3c4bf7d67d5eda3ad6b82b846e6580b2bdaeed7b2ef4a72d5175a1fb7f5f3327b24d028186ce409d82d5b33f2bdc6bbff336"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/uz/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "84f281673ed51f8c36ac72bd2a8a6d5109023a30110e70c1afc1befa0553f3a06c0718a45ba878e0d0609585e9041eb22ca0c67b8b9754be2fd4300b2c4ef1b3"; + sha512 = "aa13daf900c1f1557c3c481bf3bfd0eaed7af46b6a1e9c42da6c1c2be160882a02be9eaf62ada680a1f1124e4afff032c4d50057564cc5b2a5b8985039cbb260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/vi/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c9ba75084be67969c6eaed06cd33565f61bf86a2adee935b63ffe85a3ec225fd2a5188d7e29a4dc8a42c2fabaca574c1e3024bd06be758786aead5d27ed51d0e"; + sha512 = "faa306348b89a9434a3a9068a3a128a9583ebbe647a9d22e5ef9d9b581efee8520f6f76b7590d27d0347c2db34f3d35770f2bdea5c1b6ba73f2c849f228212bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/xh/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "cb8adfe92c17479f9d99d8d96ec4f67020f302256f0971efc710fcaa83acf6340dc5a4ae9bc687abf875b38809fd201a1be0e6b1b88504b26b9086941e6a92d9"; + sha512 = "b15a5f62c4dab9e44c620b18d23879886f13807ce8d0008fec028d40f652ba11c75c13cf6f86dbe044afc855d24694872d1ff5502cc82dbc31b75454321a755b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-CN/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "765196a4790be391b11e58402127138041c3911d19c4f6f8d6fd06ce7f281724c321c031b190732f9e3e0ed966bf1e447627228f67847ef7144124c82018c04a"; + sha512 = "92deabe9058262a81c465b370b128b08872dabd87b527dc524ff3035d2b5068d40f15705449f5fac8df2e1ca291b91af795844154cb7ee37d5d620f952b7d4a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b4/linux-i686/zh-TW/firefox-57.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1e0fa2fe1e2929b3f1eff68f1960743cd149f2dd023c830fe9585302f7eb8f8ca4e4d33657ac08a144cd4171154d5d78a106d1d921970df541dd994e534db6e"; + sha512 = "dd7266ba6bda17fd0194edd2855f1e1484758182a1c5c4ce14cabb046af31b277b2b385b47f6b368c6ba9840a3138416a0a787494cf7382827ff9bcb39b23655"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 20033e182402..095d4fbd9460 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "56.0"; + version = "56.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ach/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ach/firefox-56.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5e91b737751e62f34d2d138956c115120993cd6e8f4f86b7e59dbbcd38f6dc30f7550cac45d3a8ed866cf24c566d042c4ca43bf1e14c8f8452db428a78d167a0"; + sha512 = "8c6f9261a614b353e20b2b4a07f21eae8aa86cde092544ca924c5501bed8b4c26d8a1dcc2abd91c57704ba3c99b43014483c8f58a0aba2e0d515d8de2df93682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/af/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/af/firefox-56.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7e523a24713b84e182ac060562827778d99d9c6125410ba9dffc151e53fa87774943a4dd3ce2c4afc9d17340ab08fd951832af35d5715d143303dbc94bf95d87"; + sha512 = "826b056547856e7a18b7e352123462491850d10699cd33b9dac696cbe3112aea3fc445db77f1f10392ac56f400967f9b4de6433d9d24f3e756b1edffa72259cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/an/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/an/firefox-56.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "410b11e1bf797a5bbde80fdca6ec0b223e5fb4404441636b633379d42c1bf337faf00f70ac71da2b44c71ef9a1e7fe9aaea0e71184640d5e5f20335d46b9ae03"; + sha512 = "7bc420dbea0fd02c1ba03b6e4f8b17a9bf053dbebc2a9a91a07a725299f0b976eaeff55f3918a7dfd30828d47d02e266e3eebdbd4a431a5fbff9e066d6065604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ar/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ar/firefox-56.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "82b390cb188629f0942c8c23db1c84a377ee6e6046add935faa036c93d7d0e9da50ffdb6f7bd0cee540781fd05fd28e9f5799c6970607e412659a625f850d262"; + sha512 = "2dd2226eb5318e42d54a03eb51c0929b18431661e567ad8524a1229445ac399e2dabd63e4abde3af5eeeca6ffbccae37c38b31f5a35c6828de297538216310b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/as/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/as/firefox-56.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d321a7b25d3b06ae356ce875b10d42082ada5673ed73edea419a1b021853fc7079c356d8e7a352b248d470bff90adc0ccfdbcfbd886945c219106bfb00b47931"; + sha512 = "5616393b8a26383b24113f6b14c95dc96a9d1ec5778995325e48284e1299a4eceb4715e2488570c1ccbac3f38c286efb65afeb128d3489320dfebb86d32fd6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ast/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ast/firefox-56.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9ea303a429ce7e3c33e306c5c3cf9e8ba30e9c1441b8beddf3480a488fc99fc95f996f3b38763c04539f9438bdecafb77fa019d4b3a81edbcafd024d4afbe32c"; + sha512 = "84105f28470ca3b173ef7d569942243f206e8d438e76166ed0ddd9b4d08e3d725447d44a846132a9fdefcfb35a869f0d765732e9662b4513f3da0aee8fdc93ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/az/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/az/firefox-56.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6fd4196be196b6770635499c1f4eac4b3b1f67073c8a4c2d78fa89bb50ddf64248e8722bcf2367987bd8eddac93663f7f75790985afd39e1399b71121e73f26f"; + sha512 = "05c402cd86b8b133487e012f1abb4ccab4a90756415fa9f7421e8a50482bf2fa853034d4f779120b6d8fb9c124df2f16b9a4ef65d3eb38698db90d612da58f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/be/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/be/firefox-56.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3be882b52db840e9d16976a8596877b1266e83bf1523e32467ba914a1295dccd5b578368bd19eb6a2c864a34e0deb06d75ac798b65e8d4216923c9e60826f0ee"; + sha512 = "fa1135d28c23475a0184336067bbcfcdf7b707b5424896b9a0766fefc92a8f5fafd4e50ed0064f8e4acf698738672b089c284fb427ab6db2ffce63baadbce3d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bg/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bg/firefox-56.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f5e04004f3ae5944e3b2cfd8922a670bf41c962135a6e65fcee7feef70b4e8de9c159bdb823f9819065b4225de621347066a9dc863aab6bec2bebd05b8fc74eb"; + sha512 = "d470db1e995fa104b7504cd9f4b3f86851b130f5743235848a12725b294e4bf5a66327b93a0e6ebaeb8273711033a8b69f9493ed48b3c09c3dfa4899e8f09148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-BD/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-BD/firefox-56.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "6383795dbc65a2d63485bb9014b6119259bf07cdd9e0240fbbf3101b9c955d2008739dc8a7cea4e98ae17212ffb867cfc88ec781935a27d2a8e009e3f2bdb66b"; + sha512 = "4c2c612bafd1cc5db227d98e215e261546368391b2d3a5f13992f0704790a3bc0768b664fcb913418a31c97ff3f04019057634becbe62e357a8ceea48d31c28e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bn-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bn-IN/firefox-56.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0233366e72f24498be112a584180181401b3bd5dd9dbfdd5b5a320ae2fb7e96c283e0b142c8e3a46e8f3a1ad9958833f7ce3f4a85add5f5b70a3b0e7ca29d996"; + sha512 = "776dc919081b9ba8de3613614654371b34ae1e31134bce63afe8fb05eea9133cc27e8214ff41046708bc5d812e9046605ffbbbfe8740ab795d908dd714c93cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/br/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/br/firefox-56.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "667ade9dae138550defba527024f0900ae78a84d98f427ab5d767140d3bb0636677390ca0365dde4b526e2b0b318ab87aaf6c39f85818fc9f2dc671fb7a4a39b"; + sha512 = "17d0fd5524a52ce8a81acc3799235e2e6cda905df6b40f70dbc837353fba96a4304a46078f887825f381adc6f5b0c519c71d2ac2fc848a7a5e96bf55d37e2cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/bs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/bs/firefox-56.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0addc663903145e6a95350ee23c734e7fc42156c07d27e60efc0228da0e4b20f230f76e7802edc795b95c8ba7c1db3133896f4bc3e56221a782eeb78ca57409f"; + sha512 = "667a7384d89e1ef3b1dede6a6c362104957937352e49406852e6be76e615b1d093e6a8db700e9658cad7e56297d56e46baa0cf0fdb2188ef9d744e44683ee30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ca/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ca/firefox-56.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3a9b9622324528b7c7196269cd76ef6e15063ffd1944277ff4ec7cec8f972001718368154a5edbe7af8247262218aed697db46296a13e5861432848d3a29475a"; + sha512 = "32f87cd6f5bfc8b9dbf10ab1339bc525b80ba50e24881797cb244b7b7079fe25a28ba6934cd7534802baa3e672b9b78ba36b973b264c1d00988669491b23b5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cak/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cak/firefox-56.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b691c0828637e13cb73ff281a939030effd78c7760cdd5826f723ea7b13f4c7b63bfddcfb27b61aab414f1621291756f5b98ca966efeac368e21e780147affeb"; + sha512 = "ec9cc56a2cd7b4a9f9849124df9179184facccab1abe062b0e5f05410704562bef4dde4bfef5ed10187b5f1edf86033b5f94b077d8d48169e037c3b17514f038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cs/firefox-56.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d99ac651fb417674cbc0750e5e1250d2e622275eead4d9709107f05359d1f62b248295e9120cc0ef1d5de61d22c0f3a889470b1b7fd4c04440d0f1a4730071d9"; + sha512 = "cdf3b7123c4b69d22f2aee8dcc816833ed876fbca1e0c0995180a170d7859fc10344384ca4c8150e6d0334978e5123371df2da3ef2d726eb39792307d76150ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/cy/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/cy/firefox-56.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "68bab0e265332111a09f04d651bbfca5b462cfd0c4ecc81f7f09f5722f52bd9a089ac28303879681d9ddc7c0da7456f71cc1a67094d2165d3f722c25ccd8115f"; + sha512 = "2d9e04aa36cfb0c05359a9d51706cd759dde52901d80f68601d3f7beaa06419432a3026c1c4b4a098d31253ec871df227d69ba9c79ddbd282a229376d2789774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/da/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/da/firefox-56.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "694e988e88b8b111f4c47e75dd439b03edf5e6d3476a0aaf6ff6a64f3732f2b47bb5639a017e026b49d5cad28ff2d9beaa1fdf39571400cf64753a2830a162a5"; + sha512 = "1e8dc3f4deb5d87d8c2b89c32311062c5c5fd2e374af249e84c247d438f0a3fae53f97e0134ab9a778a84a7f49ee3f44cbbb5057212cce95bc4e977fbf205095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/de/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/de/firefox-56.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "9647ad2fb13dbbd3bf83c43acfd835fcabcfc27480f31798939065ddd6fa4559fd22d11b656a735f88f30895842059c34f6860b61945e96608756306c3447957"; + sha512 = "0acba4c4c7905eba03d6752e4de2b901716e0050d896359cf7821ebb4dd197f80d5b261b1c7c6838ac6da663063b134990a7cd785fc13ac1928f78e9de926d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/dsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/dsb/firefox-56.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0faa30e572a216576ea8ef60d0d23847fe731634cbe87873a4e7fbd74dbfef85f7ea1c46175d5519ee0265a36603a97c0641c564f72a89de623320137dffbdd5"; + sha512 = "de51364f0b3fa5f9075ffb50613cd274685a6a9ffd9f665a658da352caab4268e6e1e1458b8c6158c6f511184f6546c0c7fb8f78eac36de6b514104e6bb543c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/el/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/el/firefox-56.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "754f1dd8cc5e229af2f66205054c60d6c5c78f92e8434a2c079a2e4f0ef28a4b29e1b5ffa0e1828c613b749fa0105874dea03bceb6b2e3a01fb910f1a91005f9"; + sha512 = "0c5292a67bf838f975eddfddf27da2cf54905479a2a88ea8e558161a491cd681f137d2f147f875e449e06ee99685b96aaf73214813cd7c9dacfe425340a8a850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-GB/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-GB/firefox-56.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c16a44f0b057075193bcdad11220ab8e2a4f342980b5b04912bf00a4dd7c6f92d8367319422e27f96413f2aefbbd60b012d62909658a42cf62b5d12abc09ea19"; + sha512 = "83fbd797a7a798985b8413228f99cf18ee7904295070fd46e00dc960e72a7a59106cbc1e1f92d613070a7ebc91912f41dcdcf1c36a537b26612d11110ee05db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-US/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-US/firefox-56.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "8b92bd537c2f962855e7ee4b259c99f3ecdb9939c56da118f38063588de222fddd66ea72fe95ceca5895229804fcb946ece9fd5beb476be771be430804d06be1"; + sha512 = "45f14c5c4d707b10b3e1803950389486a59543ab408d449f19f04718f50e17c29c00d51a48edf7cdaf05dc5b7037dd221e3902c3c4c64fa2ffaa97346ecfd87c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/en-ZA/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/en-ZA/firefox-56.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "bbe364ece5f1da652530684fa36d2e13051fc85f90c147046110acaf4266ae187067a7b1c59dd48cdbfc5e10ca8df478579e20d19ed1e00b839f4fa1e99c2608"; + sha512 = "c863347c33335f480cceef6d3461cb44940f87816c7c0d9ddfcc2f1f0722333100acf766105eb97210796e0389df4374b8b0f99c0e4da021e8ecc605ea64b914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eo/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eo/firefox-56.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2098fcc0e8405a3ac148ab4aa6ea3fd686b4ca839a3102886de515234b06a246bf4c588e6e0b3ecb0ce5c053b4f42e1d01cce79249ca22e041ec35e151b58ffb"; + sha512 = "e0f322497f5b5dbb274926ba65106437a054e524b7819b5adb134a4af7b67eec58ea5c5d0e098569c96cf842fd91e06901e31240459a309c62cb87f9d1f7ecb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-AR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-AR/firefox-56.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "868e89a57c7ec69ff936dfc3dc3042ababa7c703bbabf5c12044668de922f22f0fe395f792891c839739e859a570676605d17c3c86c362b78155089e9ebc2437"; + sha512 = "a11866faa165e7c14f0a932681b1cbb4139b733225eb7e3fee7eb952a7c7fc8eb20ea2ce06e1201ce4a6e26835587bad025fec89366ec013de7a5e5c417df498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-CL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-CL/firefox-56.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cab2543a4d0d2201f4d956a5a35593c0f52df8ebf03ab4872450c409b11ea9c13b794897d8f4bfab6d362d50e72823c57405f8d78d3204d5f621592e188e69dd"; + sha512 = "07cef4339fcba4a24f9fe8023f78809f7d7d2fc5bad3ded7ee7d54776ec9aee0b4409664ac342cb75a309f3426111e9c0278e61feeacdaf9779647bac2fe7bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-ES/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-ES/firefox-56.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4f48a78207b5bfafccd8c76f5d5e06a38e79fda36739ef3f2f6359cd392c02a79367eaf8c136ed56c8ead59dd176388de3bbab6146898939fa93db01cfbf53a8"; + sha512 = "e3416bc824c1d342f50bb275f94c5a70b91877fda49d8efab2691e739e6cc8dc69d6c8b7da42227b28942e8fe235fb9cf56de52e1f2b3d34a3bf6e6cd37e74ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/es-MX/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/es-MX/firefox-56.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "deaf33a4da6e9caf88668d6ca1f634f581c258f8d2ae47d1631735e5311a2818ff951c5a95c6c555dcdc3a182872bd64efceaeea3350ec6229c5207366f8a928"; + sha512 = "647dcdd35334f37ba558ba5b31ac984f0a48181387704932445a216ad4bb9e1941f93424d36be4dba6ceb4d42a2dcbff15b011f07eb342c413003fb91be00a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/et/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/et/firefox-56.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9ccdebf0492d629be1e6514cbb9422bbb224bd7894e05d6343fcec32dad2e6817727c9becc1df487b402a5e61880d073f3315f4fbe221905c60d5c8324bbd57d"; + sha512 = "09bfbbdc62edc88417211067f4a73772605eb650d689be07df028dac9366dd268891f4ee8cf8f122fd109339739caa6be1a6eca1d35b1240bb89a763427316ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/eu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/eu/firefox-56.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2acea950147b6ccc824a42a0256730a6fa1e7226a4bb3ad093a555af5d8323c1a4cbf8affa20ffdedbb3a0c1e2629082dcd01a8c4a18490c1cec579f6546e371"; + sha512 = "41c99bc9d6047b5a05ad564aac31e217cee3db42e66f6f5bc442034e3210b0732c8bb3d64600eacd16719360242c1991957d81cd0d24218535dfefee0b1397d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fa/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fa/firefox-56.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e4694064bfc8e00b3afb3c83c5286e93010c2d9a90daf781bf141787190aa6314bcfec9ba542fa136efa653b7527ba7c264ff4cd8cf1e529f1402ec2abe90f3e"; + sha512 = "16c8a8cfb2d87d6ad84180074d78790fe1edd59cf443638606b17178a453a810e78a3f8a393ce730ab65d31688ad0e0ded0b25012f0b74baade3bf6d2fe34788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ff/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ff/firefox-56.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "93d864d355ebea2d8add77031f490edb13f1e1faaa65e4207a4013c5bab1b473f6fd8d7f5867cd5a3bc30aa23263911f4dab2552adf570675427bbd3e3e93268"; + sha512 = "b56c8672b0004958277471e1fd7b97fe0fbf180ca4f272a90cabf7b5aeeb534845bf6d0086cb7ccf0ee61170a310f0db9a782cbf4e660034cc978179f7d0d343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fi/firefox-56.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2bbdbe8798e2050432bc53f655d533fde999c8081a8a7d494e48d482afb572a08b3c63840124dd50374cca813aae7e87629cfcd68ef9596eb749b5bcef0270d7"; + sha512 = "206429b73399333fbb9e787132157a51096989e3cfc9cfcf2573ab5dc12de2d0d8b73fcbeeec6c08535ef4fa179899677a7beadaf698f661e3960a1e05edd617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fr/firefox-56.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c3903b640f674f5da1a7097543e917ea7c56c2c8749a30776fdaeb518d7b0ac874533cca0aae643d24175fa6307ec5cf00ab457ce3dbcad52a02e4269c12550f"; + sha512 = "837bbb752d18c6697c8fb357d228b9cb24eacd2b4f9d7ee58959639d165d06de585602ef30391a5110a4711a0c2ab8e104395cbe20a5671da67d3cf90947f73a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/fy-NL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/fy-NL/firefox-56.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "246cc7102dd43351a6751f71b30e347a67db6997744fd6b94d2179706304a370a36bf31b00aec32a41cda37ec0b734cb93b759bc30369ebfecd20ab3680b0c74"; + sha512 = "1d4fc9621b08e34c6dbc19c016a4ebfc503aba17d9f69d6d281a2937eeaef8dce4b6cc0ca7d5d39392f487c9d19556bc175bbfed798e946bc81325f111f45dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ga-IE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ga-IE/firefox-56.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "cf825c5e47045afdad04cce7622ff91e82c2ab10c14d6c7f0338f37221fffd1df86b79a6dd606a333c83e029a21421220616af6bf417c1a12dab8504ede297ac"; + sha512 = "41f88d1026df2521498c5f78c5bb12cd4e91620c87966429bf26b23cbaf872c2aa3e0ba5fedff05458b8e885901e5978c260537a865964672f0bc558e615b769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gd/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gd/firefox-56.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "82f09b004babae82f2e84ebc3d7aff0f556eddfc3be0ecc1abe90a18ac67e846304ce478fdb6c3a757ffefbef50fe733666796c4820c701f249c09cc246eb396"; + sha512 = "67ec86420e978b7f30e3ceeab403e3901c50c5ed3baa4958e2e36cbd4db95645198c2df81ac9f68160342a09b882b21c397210a82eeb6c1243264e404e9b9fb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gl/firefox-56.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f5b6513b4dac92b02a4961febf7c734b5b9e1f9e235bda4749fb139c9c050116d1f1f222daa50c0bd6209b7958f8610800d4504d9a9d7ea255bc70ae7149f211"; + sha512 = "81d2149fa9f1ba4f1b69c8f2973ba1f127f64f4bfeeea0dcb5451dc88f3b681f7ccee5fcae9bc8b7c1d36f85f000cd4210b54c360694d909f0cb66728553a0fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gn/firefox-56.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "de42e872ce6ce31c020a539c3c85c0ad568c720a2667964fcfc6adbc5725fb84c4d559902cd36f7daa42864c8c276d18bce57c994bb0a996727291ab29f43362"; + sha512 = "93b576f861273b96bba97eea33598d421f0251a847e853f1506fca08d094922ff445ebc36468fa457181359afcf4a7e1f185057c2cad6826376e03a6b996c8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/gu-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/gu-IN/firefox-56.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "a894ee96d15bbfcd81a596d0e1c3fe72b01c02250c54e85e7f66321db735c157a8cc971c0aa04fbfaba367817b360ee5b9acdd000d46f85ff035c5ab3762aed5"; + sha512 = "c377fc5936257a8cbce11206b0668bae64c32693161472a2e568da00c662739873b2b409cdedf041efc7bc47956219c746c05c0e95654c2e4b553b384e40ca24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/he/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/he/firefox-56.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fa3eeb6926593e77505583f5321d7fa21928642c900c9ea3147cd8967b36478e30a15069ebcf23212f82a32030713144fac0cb836808e7e3ddad4184f03629a6"; + sha512 = "9d82c000a8a09f69c9daf8f04cacec5a9c333da22f42600259d75aee7e8ebb57f76854921b34f5de078caf03edccacb59831ccf9f8b3a885842fdd1e42761b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hi-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hi-IN/firefox-56.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1749903bceca3b06fede93fe4a3cc531cdfc65d9bd1ceec7cfba0fb0c1c6cf74118de4e5f8b59125f429ab0797fd308b511bb50087237a2b470ed164281fa143"; + sha512 = "1bf8c4f4252ccae9bdeb6201e631ee178c9c33c17661f680a5688138ce875f05b17618935247dd614a99c8b4c59355300160efe3dce3ed4dc672ec1ebe301a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hr/firefox-56.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "244a2895a30d6f6cadb7de82c5b1fa193a41d7c255d27ad525f30e057a2571531999992f3b8735b5cc549ec4e0340d0027b59c4518992cedc4fc2ed89be4c73e"; + sha512 = "67db04beb477b841f50125957f1354c597a4e02adfe3a95e0e177bbe436fb103ff99a68a384e8431894669cca72eb27f3250f7547696771eb9dbacfc6ea9d39d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hsb/firefox-56.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "274ebe64c5e0395d26443ababf3c998f583024d979d498bdb6de65defe330bb862abb8b29202bf17c8c6f5d938623936dc9336d13e99c214027d9cfc261f2b74"; + sha512 = "1e3420c4003335e238df8b2d1f1e8116f4aa6f134140f0c4201bc1641c854a716d5845b1cde494e9d7fa8842bbf8a6075e5cf0e06fa7c6e5730429e4543df2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hu/firefox-56.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4aeb33a804b88312fb68e1429627328accb82db368b017214c9dc9a8023dd2a702e787c03020a5047bccad9fbfa82b5f44a9079ba9235dc03393e1b766b88f7b"; + sha512 = "81935ef98b9b92db81f2ee3cb32bc081890c6e72c5fad4fbf601e9fbdddf85983f4c2d39d4b3a75f01137e3864bce1deb029bc6d7e1c2fb3927f40c7e06e6232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/hy-AM/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/hy-AM/firefox-56.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "92202f50142c2e0dd0384d5d65ed1d059f55ecdf583e37777017ca3fa428225e1ced4206140f268fa5eaca301414b217f5e46f435ada4ce1a70be87d5dc30cb6"; + sha512 = "2505aa2f68de27a09a24bf1323a6bfb30eb35a60d4abb97451f5fe749d4a47a199a5f8ff8071beff19c9074627d68f5a3ad014694b6799c2a318b9547996b6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/id/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/id/firefox-56.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b2b109fda6ac076c933765698026d278da662bf026a4e38b351676d2c73fee10969f39650217ad225bab1ad387fce1f42b7c5152385f1779d98264e0403ed04d"; + sha512 = "ae6d762a66edca161f9e4a547b3ca99b34f727961fc5ab7a57885d3b9ab78a0c0d1ef6b80fbf15451ad06b9f59d7bde4dbaffebadfa51bd8f89c7107da7296f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/is/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/is/firefox-56.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "b5d753de5f044b693345c0dbb112555baa0f84a385338780c99bf465fdc09410b920083ad160f4eb56db5e2b73e3571aed8f8ae3b3d57142b9e5e452c39836a9"; + sha512 = "91cdf41d9433d20cb737833a006f7b0e3408de9dc80d689f14d4c8c2cb1ee1cfbdb37196ec8cfc68e6ebf56d53b437917ecd9d18f935aaae5f4cddb7ab277d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/it/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/it/firefox-56.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3c6017bcbaa10da0d8fae0c37713cd06c010b9940791f6f9f9aac3f8393d18406759c6ea0c12fec02c50d52e436d401d67839859d96322d7ef3c664063d380cc"; + sha512 = "5d051cc24c2cd5811b0a6738902a232718d3a6458b372fe9ed7923a15b18329607e93f062b4ec08fff4eb270adefaf9e39498e22522c102ea23b1d0a50bf3f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ja/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ja/firefox-56.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ba0f3bc654e0a6cf96ac555733cba556c3725474df71be52af06741a6690c8213c604f1f04b2df048b756addb86b85593e8b91b0bac714925e53469c7701c067"; + sha512 = "796535836414b3f676c0e037f03cda49feabcee5bda2bda64130d569881fc5da7eb6040ea5a534a7f8685720801fc0cc9196f7d7d4225315929198598995e239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ka/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ka/firefox-56.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2bce012298b2b80e4567923b99c96dc49a6d2282cdd24b464c98dd36c2a66915f8486aca673abf34df63cfdba2bd2bf6999397610ef64a55804fd589cb581517"; + sha512 = "d597a777779ecda47c588208ff350512282af7b933a599014f65b8c7777f68baec93eebbce982e3d77fb42d77b26d533d63c67d2a96a5d4024b1f595a28c2204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kab/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kab/firefox-56.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b2e2c667d4551724cf9fddbcd8ed4029c4d91a6f7363804b9f1382d6f4463ba65887174cb44cd4f7a5be525db8699ef4f517dcc3f87018d65e9fa136219278ee"; + sha512 = "2c60fbaaef100c38d4d95f986289d9cfdf4abb739aa3320a882d218b949d7e293d2b8cb52380cc4991a7115d12eddc9439d6894d862a631c6e3b274680cdc1bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kk/firefox-56.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3e3dda19c1f03c144cdabbb4f968eec57df764053655d0a5cb69476d6bbb312cac0f06555422c1d95985871f37525f1675bdd4575008fbed99cdba2f0e80a3e3"; + sha512 = "aa8e9255072a1154dfb4230effc9ad6649b02931c24ef4ce8e979fe4bfd9c350aa9dba39a7d0b866e11e96be29e0fd7a15f8f7ff9708ce26e430491453b49c23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/km/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/km/firefox-56.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ed50a3fe8f72d0391a3facaf08bfa34bf8227689fd74e2372bb78a2cd76a99f150669a0a30c01879096a6fb4e6b1bdbd15b41756cf41000a1f10f3e5b7038cac"; + sha512 = "e5c38d3ce0adc014510f5557577a2bdeca238f9675f2cad90e42b4ee15bbc2315cd869ec4d3a6fa380203491699d1402f5aa59c1c8cd8cdb15caeedfbb7b7590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/kn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/kn/firefox-56.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "fc3d3adb8a3e92e2da7e3970ab3f45a1c8750acdc11d5f7c062249a6f025070ee631dec1f8ccc9237f00442b4c9c782f51d8f2ba420ef5a8c3c4e3601e292d27"; + sha512 = "ec5bd88e09660e6b3e02fa34bd3f8f5b81be7a6dbadf55e56256535ddfeb5734aab85ac47d16a14c41ca8b0b66b697c50250178ed341347a6763ee2009173610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ko/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ko/firefox-56.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "05e6a136e711d1b13adf78037dcbcc21a6af7aa8eebcfca0c839810d8df4e87fd951a12c705504a585e729af72b6f6bed8189d3c5f8919f68f2aea72cca2f1b5"; + sha512 = "33f6b9850a1f2d5f6d363b5830305c498c50eb705b552301d34988e9a446d2b438e83ab29cac45fd1be3c7be016a0eaa631aeeedf4742de4f27957c02a804491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lij/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lij/firefox-56.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0ad5add37962d986b6faf324a4e9faab8c0366c6c04b34bbc5829159ed7364d108c5b324cd6ee42de279bc58c414d347054218dad268132a2543913841b2846"; + sha512 = "77d2cfa449fc522f314749aa3a0850591efe4862bbb9a8e9dc1abb9d99c2b16439f7845aff9686d201bd23c88725212d28b1837fe1f2b20aea3c78525a8e1ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lt/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lt/firefox-56.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "efb74c5479867061c9a8ae525893114d85d253322a4411a7d67f5d1bfd17843b371ff58167d8c9f199cdfe7f3b13592072ccfb5eb88ad62a511272ff6419b620"; + sha512 = "6a7c041f241fb6302e7c67b0a920ff613170b716e02258def0c87fe9332a69318f962797ffed9ead3a60b8a951f517f07f201053ff4ff4dace188d737bcdbd0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/lv/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/lv/firefox-56.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "030e445cbb156c12d77c1858262b6261e73fecf3091478cc9de47c4867c53b7ef807ed8a15caf2d217ca00e2d90a05f8a86e4a1f836abc99731c9384d74a1c98"; + sha512 = "ef9166f0826ebcbac5352e48a1ecd23a0d88b6dd1ce2d5ec24b0b71326e03a7b4b175eee299aa620862aca9000a00e98472e1a605d214616933512e73a439808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mai/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mai/firefox-56.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "abe8c9eb6fc36fa2eeaac29f7d53c9ced228383d24cff0c43520aba9975c6b400aa6ba44584c05395c9a4fe156ad1ec2e348cb8ab813933f514729bc4eb3569b"; + sha512 = "291aafdbc820b39b7473192a3781b96ec2fa3ddfd378c27674e18a24eda51b6aa112df86a68b6cde6c922c9567449d75942d470b09399424517cc818418b7219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mk/firefox-56.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a8c268b53e392f147aa371a7c5e623352fe80689e5d65b325540a478e9b2015ed91bbb7cae309117b16677dff1cab99e64de171dba3936a01101579b49efcd3c"; + sha512 = "9224e087bbd6b49630023dc92ae752e62cf0a9e4169dac65b07acc8dfe143b333f8840875da4b5f3ce119ee31987721c0cb8088c202cf42d6d24c773c1406415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ml/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ml/firefox-56.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "655369ea9047c3715e7e46065fadc255516e170f1892f0e0a02aa6c77ab94927b43f0d125be3b886dc7295a43cec304baf3268d701bb9aa6cf263eeed2f95974"; + sha512 = "e8fe9fda9253b20f898314839e8f70e3011fd3bc6d1a08c762c38363066452f854c530ada25bd5417a3f6eb0ea4ffac525bc5b0bd67b6e6eddca35c8eac9a6d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/mr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/mr/firefox-56.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f944bc416068446084e9fddcbcfc44ff096e29c2feeb2b1a40530317f7fbabc1c3f31419d749fc859789be9188c875e7d769d3aa09e286eaef305623f5a49d70"; + sha512 = "07ee71ab15cea520c5c1403be55a7f09eede71787f9a404bdd18882935112a7cf423850df7b5c5afd3e595b2bd3af053858a9bbc6f152583ecd03adb0cb56dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ms/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ms/firefox-56.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "25d47aa89a88da6932cced36e2d5ea5de7fa9e1d7dbfece462842daa65ff018d7af81c26659267f5a40bf621e79ca0df30f1ecc5abc5d5b159673c73d10b0e69"; + sha512 = "ef839f697bb37a81f988d28d6195b33f7aa92b1f0c67cb40b04ef3820a2f86f024a34e964f4f2ce8bfd81cb2695e6875d8d72aa426db447c6e65c1a277eb1379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/my/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/my/firefox-56.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3611e75b8d4c838ce81320e4f72d8b3425959e1962bf1b147da081f23a6536ff4e28204d01154f7e2f4eef3dd48796180d42ad7a4467d66cfbb56089784b3fe7"; + sha512 = "06e24ae1c4d86ed2677d776037378e5f50b3481f7e96cb0e32369574fb2a04c5d572c7478ba2054f3929a0714aa960c8d9ebc8d7b9559d7f294c31c775e9b70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nb-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nb-NO/firefox-56.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1a1ebe6b9b118c89a3642504c5d1175e64aa37d652741255ab93e7ed8770a21e2208434d19f95bc01deaffab7e33a011352bac5783401add797ee4c9535055e1"; + sha512 = "c2384749c1121cf7b184e49fb7ce535a2387ea32285ad52f63afa6a02746c556459f61d7f19a60552e63958aa9541c81bffe13c6a96f71c598bc4501bfa4024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nl/firefox-56.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e5348a13c66e3b6f5dcd1765bdaee0adffd0dad195be0c52dadd99fe1dbe5e381e5aea7b9e48d4c77059d1fbb0b214c25d3b51f83de79c5dc33089e2629f7298"; + sha512 = "b207a5f091f556dae81fe4d35a14e39ddb1eba9fe9ac4440d7335eaef561466f14d843d91fb8a312379a0c7ff039a763fd041088031cb48761aec6f58f681fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/nn-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/nn-NO/firefox-56.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fc7ebfebccd5c3be0a06a02b98da1d18eb6402e2b97a44a8a483845df0365a073260930eb7651ee481c5f788bd0b158e5b97017818427b9143772601ed7b1af0"; + sha512 = "e5a6e1ecef59fae002c4605e7c838e00ccf6fa232427c42a29cf27f1bb4db7c84d4c4aa70eae84b5ad40eed109de11270d02574101eaf690a212b219448cf273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/or/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/or/firefox-56.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2e450311632a130b4fdeb1aca3be2073e22acc1016315663037b0ce5daece961a2ea276b96da06219f6a6259ced97d819e2feed745c38148e766d2a08896835a"; + sha512 = "f259f88c0e4669c4d174fd011493883811042ecb4b4752c7c69dce61d7c6c28267428327f891c2eede911667807b6554373e8f2dcb8ba9e2f3d90472aa2ec960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pa-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pa-IN/firefox-56.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ab2ce9dca08d20bd9f389f04ef1b2049ef60cf98c0423a59202b623419714fc1a1a40210e11a73a804adbfec1d6bf142747b7a80e7c83e35d905b9c48d7bcf12"; + sha512 = "cdc2cdd6902c86eab3098514b2b676db6d8a323d3b78b2da6104fe1be17cc15b3d38d5fdd1692a87521d6afce8c8bb8e0f78bb7d291145ebc05b5a76d47e34b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pl/firefox-56.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d9b75c4777f029eb9645a076de83b634f8ce003dc3bc2276c94f7e6434fb5d4b06eac0a2998b2e4abedeabfadbcd9410c9c6bbe58cdf5bb257601f3dc0dbf0db"; + sha512 = "edc50ffc298fc92100faf0b529716e14dfed8e41965e3b4a8d040bb90a526309bbf52c60d8d8cb816e0db99bf09401b27602cbf0e7e947e3ecbdf61f5c53be59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-BR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-BR/firefox-56.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bfbbbf7c2f94fdb5a15b3170f7ee6489a4cedaca07385643f659e553923c0ac06b7e7d38f80ffff082a56c1f2f08fa883067d1a3fce1531f1e4160d9c8f7dd70"; + sha512 = "9da419264035792c3e9f601bd9198e77e0fae17a7ff2e34b6322667cd95bb79ba064a59b6336ef33571f6cb5f721a7f4f35e1f9ccc94e68196c310a683410846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/pt-PT/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/pt-PT/firefox-56.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5033151554eff19cbd1b9c66cf5338a20a8855e677761f89cbee022b8a2cef962161a91a7e67b85c34ab3b44ec4f4a1a638e5f7955e998bc29dc55ba072b905f"; + sha512 = "b151504acc244ad3b80c2dd7ec87fc04682e06bb53338bc39aae164ba1a279c316eb84e33d1b41f4261135c39f0a0830a7f74f5ad7d0d3b9ea0bb458d628a9a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/rm/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/rm/firefox-56.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12426599187b70240624401aed139c9c61ca58d3bc721bcad01d253942b30ef3beee77cd8d76c17c9204ed8a6b919cfa9709e775c520654c7570f26a1e5234f0"; + sha512 = "480b46a34d36fc03107af64caa5c6f0cff95021cdd094e7c0641f28938f5f21aab8e50b8985e0b42c3cec2650dd4c9538df93570afbffa399241ca8b757c2ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ro/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ro/firefox-56.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3eb917db04503d692883d621d783d6df623ece55da12769fed51634457ab9dcc4c879b79c232054e504d266cfd167a208e728c0b9bdfb2b9a80e0edc60ed0524"; + sha512 = "3d257170a028575739fea107cdd55a39bce7c534244b4701716e0ae8930e79f04a9fad14c5123c1799fc7ff0d1e98b563e338621408c7e9fed1fd1b84c72a930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ru/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ru/firefox-56.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a839398c7afcbcc7e4902106a980675ef46123c7c8466da61586db623bf559e4238448003c722594d8b0a39b1da1efceb93d923d5160ae20e5d3bb6230005d4b"; + sha512 = "954853d2f0adf078eb840b02be69500b0abe8d76947d1e71dc48492473492e3c3162b1dacfb1089397e2a4985af4ec71b57a01d86fa7cc3f22515aa5f772dd04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/si/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/si/firefox-56.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c37aabe213ba6eb7bf12d56cdb65ce8b95fe95c40fdb0edb58e9abac064e4ef232fc75787d2b44647cd1887f117d6144d00d495dc196fade8bcc96ef06c6af82"; + sha512 = "3cadc96524cb58a02aea721a7ae54fd81e660faddebeaa7f2a1b498fc5fc4341ea04093743270121af5757bbe9f6e80c9dead96c03a3e576b530ed3ad4edf7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sk/firefox-56.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b79303551562b52e1fcec89819ea2ab04e1c5dcf41b9dde067da2d2e0a51307ceb45e0417c94c1f446bb80ee2c7f0e1f61479d33088c843423d5b195a6df4ebd"; + sha512 = "b800b287c876bc0512295ea2f797e0c330604a9bb9ea5d8ba37b23f79d78701721bf98a329bd58c157d7e8866352fbf9a9508e0959ebbec2f05eef6534eb9c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sl/firefox-56.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c51c1a2a81e6644c144840ae3a671e74165add9244975f2671a17ba6beba9096219e630b4475b9a576cf0d0c2fe8001692903a984bfa1adf92b7c34bed46cd9c"; + sha512 = "3a672e005fea767d6af13691c2799d95ec7ea6004e889119624d01d02643bd73a2ae7c6a2b7c96b80572366ea54b77a4d83aa02370a884f18e86e6633f774a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/son/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/son/firefox-56.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f40f28d3774c528e0b8043e30e9b4f88b46b1e3a296934d155c9b340e099937804f7d5b80c845df251f70401099dd089a09169c55b9f39f7b22a02261381ab73"; + sha512 = "01a506d12757586c61a100755d2610686f2623c9ec7c60bcd1908fa02b16ac129ad0be7d38a43de1cb7fb402860a55595f87ff6b16e80360f26832dbf2c897bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sq/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sq/firefox-56.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "728941b8eafc179e5100add0d2489a418b28973e2427586cb662c34e7ff080bf528ae7037835b7c8965b68c6cab3fa5883cd6bc8f1b849937a5d37cf069765c0"; + sha512 = "e5ea656718a965bb86d826a1989bae6c20f3722f3d7a2b2937fdca06422133b94fc0845c7dcf7577527399b8ef6e78c13e4f37c3109061dfe62ae12f4338c27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sr/firefox-56.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3108a89eedd792e44334b232a127c7c8896d1a9fe389acb206118f341a747f65924798e99c36bc1be19c215988785fbd1cecd20f2707afe63a9b0664e23051a8"; + sha512 = "c436c4df233230f0cc848bb29e36c2715d7d6bef09bcf3fee60e35277b2dfbaf5d0556507c5853daffd823c7ac3af47e9733746302e98cd55c5a45eb68477fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/sv-SE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/sv-SE/firefox-56.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a59983dae6d6814e45564dfd7b199412b7d7ea76afa0b0fcdad9019ea047b3c45d49317af4624d99a2375a525dcf72b92af0f34a51d955543fcaff8f407c6f23"; + sha512 = "62f2e7154161ab18902e107d83d437fbab65de3195e49ed009eafbfe2a4f82bc1960f4343c52121edd8c36a57200fd5a6468706bbdbeac9b60416988964e548b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ta/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ta/firefox-56.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "458033fe202c3191cf6c8930ea8697aca2c534bb4c86c7f0a85925ca830086120d4bc3a8148530b8f04c621c5da6d2674321ad6b4f9af7fff0b7c02770550ed2"; + sha512 = "3c125c9c03646ab80a65a5f84b14c5a2cdd0419cfa0356fc1f28a77b3df463653d369e9aafafeb90a4281333f9ce270097a6aef6b25ad4408312360fc751f5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/te/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/te/firefox-56.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ce7dd880adf34db123f85dd1e8d28dd3219e9db59177ae8f4e978efddec67b82025d4a2a2d90b7e8acd4f093b3d019e4b4e8203c70e1e8a41756bbd1c8eb95ab"; + sha512 = "4642cd96dc68b059b6790ad1313f499126d0b68fad49fdc369f7c70b3ecdaceec3fb4572dcac0f75a415566b6de04ac6086dba1c57e8d5db4f5c360ff5b8bdb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/th/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/th/firefox-56.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7c23001e41e8e09f7468c74c79dcfbdaf655894f1c9a20bd87357e39f970faefdc1601b4d0ac2e442d4ee490362f17a4817269509280e180a2cfc31f8ebb1e64"; + sha512 = "593768af7dc80b1a5850c493f80f2c538fa76e1b5d3b288d74c6be2bb3736cab29a6a1f68902074b0a3c3813eb29f0b461dcf0130ad7fa4f620917a8c1e2b738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/tr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/tr/firefox-56.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "27bfd7c5d3cc45be0d29d4ffd4d449a0c564bf5eb7d7f86b808429bfc4cd54cffa9b7dab213122930b2b666ccdc99d09f8641670f79a1d1250988a1db4079a2d"; + sha512 = "8314f255717a1dd56949075a8ac915e816d7647c39027ac636f79bbc2f6d7b9d1bb593a1ce03a9feb1ba41d4cf2a9613a9e64a42db448813b874fd0906267b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uk/firefox-56.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4073153ae727ba314dcb77ef8d8fadebb5e397a4c379d028ab381194a0c9a325ee2573ee22ce407c7d774758d74644f033f5e17f1ec402026bbb1b1c4b806520"; + sha512 = "bf6ab16560f18a8e2eecc010f6838839561c0255beb6fcdd9a13767a34edffbce58fa2911ef13f5d6767cf19c96e0df520d6682d3441bf860d0654357bdc8f83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/ur/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/ur/firefox-56.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e0ab4125e4d46529eb27a5d1e2039f36463b88b87370151955fe33d602bd1c72ee4fbe79cf669beea81444f340df3da1a3ac4acc73ef47162acc7240fe230841"; + sha512 = "0a6f44415b465597fc58bda25f371da6cf7f31718a310c96ce1f1096c75f627391e62d10086d6816d64e4199ab0d971f1fb8759f6509967f0a7f79d8b6b08f16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/uz/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/uz/firefox-56.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "628af5328deb486ebac3c3e631a3314c39e3a3cd4d76610c640ae60b5a827b62a4364898c895aa2f7bb300146451b3d21a1eadd484ec77665828591b111b40f5"; + sha512 = "57b40355881e13373f3d122585c6e7fbe48ebcf86bbaaa78756e75c669d359b1948a5a42715d32ad4cb9569008be271e15ea2f8a998dfd15f7db36ef92453386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/vi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/vi/firefox-56.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2e4117e805227dbbd96f2b5af658971018000e7dd89859f5f68369e45885125b60810a19f5d62affb98290b0846fe18ac7e96552fc8500369ae10ad1a2ee245c"; + sha512 = "3f16a785a361dad4e395882cd2a72bb8dacd5c58c47b75d18d9406602a0b23ef227788652656398de09278f9fbb52dc61b7a9c649d5382a1fac663510f228a71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/xh/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/xh/firefox-56.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b915c86aa00d09bb02424f93b6135e3f407daf73d8cead602682e13e78d6eefbdafa5116f8ed8683f3d42a2eaeaf3bc63660acbf9c4104fe99a8d80ca1ebe695"; + sha512 = "e2792d9bc89033739104f8c14111dd07c28dc49be4ffa820ccdf88023d93ab7598f1b954183ee3abbb47b78ba05e596dbc7f458cc7c77cda91bae64ce561e5cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-CN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-CN/firefox-56.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "27491f5c075c2a9ab48cadbea211be12d4cd1a4b110d7e0f211a7255cc5109f9b1bdeadca1606afb0fccbf70351aef6ad7fcb251a49280e46fca546e28df9e04"; + sha512 = "6ed90f1a4b157484c4f1fd0a171d948afbf2af06ec8141ce34285c521861f2bd3c3ca231feb4b8b69146c84bfcc83a675b4b69f1889476844d3cfb4626dcea6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-x86_64/zh-TW/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-x86_64/zh-TW/firefox-56.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "46c370fb51c1691b06ff026b9ae5a9682713c3c564b077bee4e3fed9ea80c796787a37dfb79babb095c05ae49db364ab552913a43e48ce43a628b3747a15f68a"; + sha512 = "e953cbc61b8b30de35dcb73407f817651fad295633ae52d299d6205668c49ed4e432ca2e5c8bdf411317c3dda1c4d71a3472cbccba94489573f96c42c09e6345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ach/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ach/firefox-56.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d8524970684dde392a393ecdff1897af03835ac07a529a643050e49a53e12dee472f33697bd66cccfb1f2ed78a261dd479d4aa25f3a56ac953579f6c6d5621d2"; + sha512 = "386e84934aad44376173c7ce27e732e81612d231a4e527f4765cc7cfc1843badffc8caa1526cecfc546507f2e370fe55a85c6cf55b9b750d98a70514301c4da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/af/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/af/firefox-56.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3624bad2947f43d9aa89a4a5867d7a406fb34dba9aa06bfbfbb44405fef3b3f78e4ba64789cb02cae561c8112b65d81ec291460522602798ede3408b7127e1d7"; + sha512 = "708c0012276f2473853efda705cb982d809edcdd300a08c105eb848be95efda784720bd2042f7d352c3b6ad96f5a63f53a70b98c9db29dbd93f14ce40f44390c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/an/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/an/firefox-56.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ad7ee2ba36ac9a84ee44a16ffaf39cffaa10325c54fb573565780ebf3d176b7f7652349bcd02f0d7d1d4f51b8fd6e010f081f770bd0393e10225ac8ef4262f5a"; + sha512 = "630d51145d27671fc739bf8ed45286bcd3884a0afc15f39c837fa213f0fe9bfd0213e6d8269fdd1887844bf07302ccf2bd8cce38e7f7d4f2f706486487736561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ar/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ar/firefox-56.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4796be96acf7b5a52844e52cf86f0bd90c8b6f3b4c8cc116578529371a77a44fe4a1176a1b4832aa4046a3e9a6291b13bd57c63b0df31cc6b2ba7f4fc58905e5"; + sha512 = "07a668a25ab4faac23a4a2adfef2b6482261b22cbaccd4121a510af96958443e4ae35d6e83bac15ee0e64aafdf5a5d4e4c21cded777ec65f0c333f9474cab397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/as/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/as/firefox-56.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "26c69f994389ebc7a0ed737c5f925f812e0ce0a1d2222406a17801891cc6ba8150c99aed0636f6585415d8ec6e7b4e51d39b39dbdfce1e0326af89faa8ab6179"; + sha512 = "46263df53558751c587f1e6f6c4a9f3fe5c4833d3c984fb507f7bece693da7d85298a85a21eff38527a81cb1f24f6cd1c8292ebd280238f70e076a4da7748e95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ast/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ast/firefox-56.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "511f7e3cb28b888c45fbe31e398d3b66192f8e6498021e34c10298096bdd16c839a0aac8db6a103efab12978f099ee3c414028ac4966bd7626556c8eb6f2ac99"; + sha512 = "92daf3ec9160505501af044b1122a544f6a6e744ed262b5e7e9fa7d1d303e68dcfe7333970b97df9add69d8dcd4b29f8bbe1dfa47301ee16da677486c73d8e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/az/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/az/firefox-56.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2694b535a2bce0c5049a143b2a8c9d62bf1dd29e4ce18d7e686df43e87aa745b284c6272a6b1fc5bab58b023427120bd694f7e8e681320aaf0f9bb41bde0e7ec"; + sha512 = "d8bfe731b8d80ccdd85f3f389fadd76fae2691ef2b02527cb96f2bead142e35fc74f7a904d62e25672eeabc51ba746e18fae70876c8c86efb22b05fe9137593f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/be/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/be/firefox-56.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "77d586ba3244e6fbedf354ad3b71edfdc20b7ec35ae520769aec4037bc45dd9d1a4ae858121c869a9e0f888f0d94d43ed0e0b4a25703d8cd0f0d8537b9631bd7"; + sha512 = "8a27be65f3e5c586411534990cb948e995e69dc0d6f7cb52afc13c47b42e42507771e3665da57ad86ee5ae532130fd176b10cd17770cab7b2ea50b0121b35ab4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bg/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bg/firefox-56.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "eddb4223b62e2bc1e54f27ffd1df85696b9bd169f65b75dbc8f96cccbfd59d110b262f0a149a88b584d4a02c9cda81ced7ea4884be8edd4888d50fb26a850eb5"; + sha512 = "2c2136346ca821f96300c59705ff077d9b3fccc097bb0da9732554b07278064d92a9238ee0a99cbbed354dcd13422b65334b03ec4a0bd0656b61e5bc8a1ed51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-BD/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-BD/firefox-56.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d5ac79231ef0f559059b62cc2b7b438fad544ebc4f44f8a88a1e2503c36547de70a485c4aa0ec575835be54657ff102d2f8d5ea5b009a5f4ee3ab9bc1c8553cf"; + sha512 = "8c53e006d3d7cec66d5fba1eeb1ff8c0beda661f1033b2e648ff84f6a41e9496d08d90763c0356e5cf9139c699851b878bc1ee3f1f40aabd3d26a42d17554395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bn-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bn-IN/firefox-56.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ff104d3271479d8df7c5d63ecaa03ce67bcfce839e155bb8b7f12b0f4ce7eb950f0b36f542e6c87402b070ba23d7154124bfe51a10c560bb7d756cef9ba0db85"; + sha512 = "696a769b55ed6beac2d7f61248deecdad88b85b048c6fea3bd8da1a7cadc792eaeef816ab83b184b0c65b3bae315bc7acc96e8415c69b4d92e50f40f96621471"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/br/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/br/firefox-56.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5c25ffd7d5a7cc974c924e04103fa81f3d4bae58b2d00a9fe57b6c849de91e29be73533e2dfa49b07ccd45f1bfa7f80861fb6736beb5deeaa55460192ca3c231"; + sha512 = "3eff8fe64026f8d337ac279193aed4f79320c35d4f5269900517c21bde2075595ad1b4afc68e05f64c8993517e832d1c34e39fc60d5eb6d1b1b6184fa912c416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/bs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/bs/firefox-56.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "63ad8bf0161537029da342ed24784c08daa7934c40231402ba867d9812ec0d01d93db251f5c253592de53b69300f669754fbe530ae4cc5f4a7043031a7dcaa32"; + sha512 = "b964f5d6540f4d70f50cf0ac3858539f58ac50b691758568a5dceb3045b7acef99af65f9d1873f01a7e633b101ee37cdfd8382ea35c8719d35e5a89006883570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ca/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ca/firefox-56.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "09ba0756946a02bbaf697f452275d3ae908e7fdb5af166e7586b84d1ae0983db0ca9008c48be93f409a56485a189da957f5ea9c18f9fb68c2c09621e16a1faff"; + sha512 = "309ad23f3b042434c3c0779d59838c920063e64734d42075581ed3aab88de947e5fe2d74dab5ee17feb1462fa7125dee6b114087cae68fdd6c402207f248d1ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cak/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cak/firefox-56.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "eeab51af57e52689003339d3f02e60da8bbc13ead89343330328eeab34cbd55c4cdab4706075aced5b440378b83e84be7d9a62182fc76f47d7945a1b1f0fa337"; + sha512 = "9454a093f4fbb2466fa63a565461f209783f24919c970e95ccb25d8c9b56260fcabbdd9bcb6ca5fa4a1e1098fef4fe50882e923954363c83cc3536f98f95e078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cs/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cs/firefox-56.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "938cef9e5f0e7bbb6b3fc87bc71ddf5b71e97c89a53aa959b940f48345876ca0c8d368f4b630776fef51a1cd64496c96c1f75f32cb7d6ad0d92bb0a3c01cffe7"; + sha512 = "b487d98f8f060d34164d78ca77d7e3f28cad212c2c9a8788a6f8f13939a8fba5bd6501765e0bcfeb3c57ce82076187cd158cead63f06b27657018e9b1c63ec6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/cy/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/cy/firefox-56.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f70dc0dd9c92b9789d8de307a7151836729fb98c55666d13beb66958f3824493adec8a409109be6ee076a26a723e5b9da1c4e6363a881f1546a739978e78e7be"; + sha512 = "3a3fe1ceb21e39bc5ae1f7a33afbdaef00a3fa2e713a8bb094c7ccdb4d724ea3a09907d427f55cefad987482f91db48e8e988b6847132ef2083c65851a95eb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/da/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/da/firefox-56.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4b9d83ec54935a6249111ef8605c184e3226223038b65cd709b7207d46d5342665fac40bd2672c40f8207a0436fe38be96bc762573d0a6453cd6dec15683df3f"; + sha512 = "c9a9073ba8fe937853feddb194c1168e188aa22fc8cecfce619c0eebc6168feea1b18201bb5cc5bd0ae758b2468dc99444a6c2bd3f248814218af5777e848853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/de/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/de/firefox-56.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ba2d976917ab0559f4c70140231c2df3c372d7363f897ba92bfecb67f7c58ac6ae4dfbd43724b3404dc8aaf8c72828ea89108c8fd11792a30e34ce9969a3b3af"; + sha512 = "12f5dd9ba04c6986e2764663648e34dbb21f8008919d6834acada2d6c6d409de4d12df026612ad6945be11836ef7db325e6e39e75fef38bd4eba95655e4f3c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/dsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/dsb/firefox-56.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "706d77a27896c711fb5660203fee10f22fc902ee5b0dc8d26c95e61c49b8fcd39049fde234143af86b0be562ae162894a9a97613b326ae7011cae9f583a8b08f"; + sha512 = "7e77a0af3a68facd2147d315f8fb0af7ba3defb712b15b1e21591ae2574d7881ceb8fce934b7ad4fe7ed341e5db6697cfcf5b901069771c8475359b4551a24b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/el/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/el/firefox-56.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "da683e296a10a6e548a6838c62d3ffeb26e1ae3e89c5aaad76b10cecdf5712421f2a2cda90105ea1da815c883d5c52da805eb31dc241bd93aa9199201efc9b8e"; + sha512 = "7e577a58a549b67c2c9d1d85750d2f371b1b280555efcf48d16a4ec931f51474a14a424887abbb2de09bc182553d394777496b7abcf34226e63cf43cc4c874cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-GB/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-GB/firefox-56.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "61f6f0646daa9c530d098b3dd5679fda75161cb26e3b39b69616629ff1674b0cceaa4aa2d6b56826e54f6f4dfe2038b9186637980facfc63abf247765cdf1bd4"; + sha512 = "b7c892f50bdc51e9fde38cef564edc44190adce6b8b36a1d5a301b5677b8ca46b68a31b5caef490e691320e76e8f712ecd7e9d963effca203464a2396345f380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-US/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-US/firefox-56.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c6c0573e967681e19667060f239aba9910648213f77d9c7b38b0d9318944ce89062235cbda54e55e0901a23f2a9aa7fdf1a7f02ae94217f6ad554f3ee9010f23"; + sha512 = "52eb7a5344c457535c263c68a6e3b4714a513bf0c3fd5f8796e8bcd0ef9d86346a7757afaf8193a8de41635b88dcb8d5b666dba86e92f75ce267f14c8adcd356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/en-ZA/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/en-ZA/firefox-56.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7e288b18a6c85549c4239972a2d162ea1288fc5939494f612a9fe2a4ee7f39954506618e354dd3965cbbe221467cf1f74227a42c43f8cef96045defe958fd6d2"; + sha512 = "4a086746611b98886a83759f546738c814577698f92b4d443bc4f0da0f1a8f5956461839bb7c3cf662d9c7386ce8d0828572abe96d17d490ced06257b311bc14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eo/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eo/firefox-56.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9f3074cbcc973fd5bed0ce0b6f6090da9a7ebd05c543a065466a3b0968e58afff473d1637242fadee31840d5cc0504f6001e7cd2849dace0eff4edfd4411349e"; + sha512 = "b65e271afc2cc1da1c9f3b9a6cfc00f6b1dd5e63043ab9c1f17eab024603869269d55efc4bcd713cd8a860f0b79fd77dc21e165e7d8690a720e7faf1c804cded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-AR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-AR/firefox-56.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ef56e3dbd4f13b49b05db59e5f89ba3e3188dc7df4d2f340401510cd59620363a3294ef2b95c01e7c3cbb511f2ece013130a09445c314390679401d369067d6f"; + sha512 = "bce196c4e86e0d2dbdcf42f4ef7d876c5afa1b407513a294c98e052ba9c320a4155ef1d41d67fc6ae089e3a57e5402c1fa7092b1efe47f95765d44ee519163d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-CL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-CL/firefox-56.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "85b0284aa6ce08609ae6e7c874c02a8332ab723debff8bb6d1b500b8da791090b44742908683ca64405dcd85dbfc474b4157f873daedfdb9e678e0bc908e2a63"; + sha512 = "9de7fb8363a8f4c632694de52b86ddf467427e64f4e92fb00c7001b8fa6df8b23ff43d77b74a4277cc1ebede986fbe4d387cf694ba82e35db0f4578382cfe77c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-ES/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-ES/firefox-56.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "36519bebb0e79a405610bac938c8a0183ba857fd733b71bb50f82f9fb16883a52818596f9bd776a56798829cf9d4761658d498069bae228ccb123da266459642"; + sha512 = "9516ec93d60e4b5c6067148d9b9da6b40defba7cd1fe72d4a1b44bd59bc4f0d503dd6a29151aa14404b32d3cd3a95daf05660853ebb3d484845452c852362140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/es-MX/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/es-MX/firefox-56.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "93d40e3df17392b4268e4efa1cd9c23d3da1f702b0e0a2305a05a31f80af0ed26738dc4eb6a4db60a7f43e7de13662ddbcae8ceaad972aaeae40a21856d9fb42"; + sha512 = "8d4e0b0f9ad6b3875317e3e7fc0f249b239e1816a4dc335d444433b521460ad16a0374851caee132e58eba3b46005c5a294fb84774ca56084df108d861dbc335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/et/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/et/firefox-56.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bbbc7dac5d3a122a9a77790d570a8943bacf4bdf1595e1297d26a23cc99efc88de088aae9533b86d573bd10f81fa741ab765177bbf86f2920232ea3a832509a1"; + sha512 = "ef60fa3a4c2933dff4fba6d8bf3f8f79faca16768802fccb4e1ce161bad315acd78abc09f998fc516683fd72fe9187b6a523961210d8629a2efa4f1102469322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/eu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/eu/firefox-56.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a36172e47a17109d2790961f3317dc0a23404856224411393d4bc0a238ff3ea8ef9af46098f215beef85c35a20bc7d515e764ed3a5c4a1cf0da31c019788933f"; + sha512 = "3bf28fe5886583c920da5ba845899674ed06586ac0b36ca353bd40cac4de2ff76d833da55b5d96c45d87e9ae66c33017a20817d4f2761a152750767b6957ae11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fa/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fa/firefox-56.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c735cf60f7726485fd10d7da09bbd75f0ecb47c84f03fd4b2ed75efa32e906867cd5c99945cb4354792bd7a978c48f61fccb7634e931c370db8c28479023354d"; + sha512 = "c56e142399445b45322a68cef53cecb063a37d24a697509da1333de4817ce1870a18e76745c113b6c3689fae28ec66f60806f478d2e88d2e213e31115558403b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ff/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ff/firefox-56.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "bf54987c9cc48218793e68580fba1f906d9168afa4adaf340c50c21d36859ed01cfc0b0485ba7aa835b1de78afaadee8c137e767589186090308316a4c0aefd8"; + sha512 = "7f868d56a29ef7d03be1fbce98ae4bf7af96db7f7bc4f1729e7d5f0758bdb2e0d0471c3f46046fd21937dd410bf0ae822dc035ebdd27b1f8df3b92032ac5ffff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fi/firefox-56.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "597cd931f7a639e4e1c0cee220968269a03cb54bf72da2c658803c5ff2707523c6d1cfd9cd301b2b5df7db63f1d6d78b873b709003b67add35108d02a7011596"; + sha512 = "449a103aedbb4596afc4a8b2ddfba5d9885756c7fa6983c25fb609ff3e280a83af4e28b04279b8f5243b46f366b8808b3e6d43286eeb60415d662ebe487e1c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fr/firefox-56.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "54dd3162f6783703b7ebbff0a15d4d733cee206feb59e131cc974cd431f9a83e8fd703c2ea03149dfd2d06289ca0db18e91a95c53a757b6b04abca506240c1f6"; + sha512 = "c171d03ca2b067236087978b86c4e69f6253f1b73b34b198607c4f501893d0fe9baddbcdb28ce033fa796982a8a08885cad361dea673dc572594edfa49c906ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/fy-NL/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/fy-NL/firefox-56.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cb9dd1f14d61068f74d7cb1d5368bdffadedc7f53059a66ea845cc7a0118ad01041b4d1b23f038b388fce9df91f962e2db8dc7ae13d35c472d9a2f19ef7f39b9"; + sha512 = "8592c501f694fcbc478670f892bc239e0a7ec152ff386d418d8852cd7489b94665f7bbaccce6bb43ecc376525f23417c6ff7899ab1c30d4276d9b4495612f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ga-IE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ga-IE/firefox-56.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d54a01a07aa3d4c5b66f8fa2653ad06715ebe473756d56e685ccf23596854c1190b871cab8827507b2da0f42b0843d2d696633cdd173a155596ffacf2b8e9a08"; + sha512 = "5e9b9fc017bda23d0a0336054fd5f8e04abc7fcd4c2bd165d27e01e76053ef19e074b83cb547949212c49c3efbfc2c620b0df3841fe46efcd4e269da4bdeff09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gd/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gd/firefox-56.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bf8e248055b68eb8b04a37aca7711aaeb30401c126e911fd36658ae4fb140bf006f818291fad4dd1d82951ffed74f94d1174420254ef6ea19925276dbe660062"; + sha512 = "500d0360a5b6310f6616343fbfa4ffc5d6dab8e16f99ce1963d7818d9b4fa99c5d93e6d062b9a27ce6b495c0cb6152bf9bd10c677a4a15c912a563ac20066283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gl/firefox-56.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "527d0febe7c58b7205cfbb21cf2e054bc8f390c28fb6a8e2f317c6bc8d58092b92f9f285dad6da1e01722da5cb198d9cb2f60ec36aef9f03cb87b48674f67b27"; + sha512 = "8cf6391df871e5d8eba58ffdccb4bcc40f97310b880603fb6633053d5b6332b347bc0819b281fed6c0370c15cab63aa78cad92a0791fc7b694ea327c5d265ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gn/firefox-56.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1599e5a6a242884d9fc13568d4ee48ba925c0d3f9ea6ca4ca1254ed39cd8187813efa86d1f65b8d7aa570f4d35420edf9a6412fe66bac34b748bde4ca9973022"; + sha512 = "23d7ea2d103190f5b6052d06e92fbd56b410301bd2546d55b56d797e02f2d3591d6d9009b8d9b6527219e0ea118811b01b9b97dc85ce9ee6cfd4952e0d442197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/gu-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/gu-IN/firefox-56.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "f6f1cc145a65c1ecce6e5e5b3293af37e731a24d1d15fb1c8e8c87d37745f823f8156f934931db0542106365a960cc81000cce8df37c863f6db47a48ce2dc382"; + sha512 = "14234d0cab5c8e90385616d7d97b9e9107e4681469cf85fb21b8e4dea052d66fdd99b71b2da3e948cff4a5419f2c609c7b92b03883cb8eb86524f84a137d4c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/he/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/he/firefox-56.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "fa56346e138b1981a125a5815b880ebdc192e9eba2af5348dbbab3cd601c35e61bb22bfaede27647705c7bfbf11fcec5e0773838dfe50e14cefa716d7f843304"; + sha512 = "d2bd55a5ce635e0355a9639d9f4299b078f30a7a3111df5904c45f7c2751075adf9ae6096fed8e5344d96468f1e3f7eb0a40077609a26636d8071dd2d75cc910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hi-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hi-IN/firefox-56.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9176dfa4d5207108217fc9df663797bfb97ddccdb43762db85247f42f3d2c6f2ef309f68cd157f9f4972c80546d131d81c5780dd6ed92d267d8567a7d9420aee"; + sha512 = "634fb324bb4df03e5ecdff8c01ac0cc108b42269652ec76606ba47a5b90d3f9a6ff7cc28c1d1fe0995ab5e36c6124ab10351059f369a0b4e91627aaedb49080c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hr/firefox-56.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0c1b1845e6aff8cd81dac114b2654ecfdf3176b7b9995c839fabb07fa52cf1ab5ed0cd93cafa969e98ce7fdc7883b7d40fa19e688c7b2e0850db69f71e13e146"; + sha512 = "dfb13315937377347bb8d8804bbbbd1402525739be2b21f01536c04c210d9e4cf6bfb6e1e9a64b4b04bc8001066d0bdbf74873e55cafb2e5008c0e6302c7d967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hsb/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hsb/firefox-56.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "88a6e49f8346f566db7a6807a5999a01ae3b843a2cb16051a7d82b250e8bb7169818ca4fd34893cc8c111ab00d62d7fedba651ba813b3bcdf639e1dc196cac3d"; + sha512 = "4a5df6642eb981bdc27dc3473dd6e267d605e3ac9df350aa13d82350d2e58be6f0bae314371532922fcc9c8d4086678cb744c2502b38305d99c0c6cb010e8146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hu/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hu/firefox-56.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0fc08455d35212d8beb1097f7ce7c1ddc5519cc6faa62c9fc6294abe4cc3a020d13d514fb2b4e1b27eebbd351aabda70a1de68bcc3865f85c782bae7a19b0fb8"; + sha512 = "39d9c881d9ff91cb5458a307d04a21e74ab57d653b08b81303f5a0cf72002b128894e6be4f4d1101df4004f2481fad4c6f63d3fe771d5e7dff31a9428f840522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/hy-AM/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/hy-AM/firefox-56.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "89c3f56d2f6b4efbdc44e3fcadebbff7ac77b845eaa2f6220e1855f547c6aa14a727a493736f7e913602c6c354f259085bdc66eaa0ba3bdae9ce53a37de991ae"; + sha512 = "0d4e2486577213e7a390d2f4b2d48b54e693748c19fb01c021e356ccf186db25e976324bb589da5040f394a4c5463f4c6f71c691ffcc900644e9996d01ff7cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/id/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/id/firefox-56.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6ac431518cdaf8e2bbad23f44793b46c87e205513a3df8c092bdc4b25729ed7355779edd2bf154f9d49fae48747518aa12acb6ef55a3206e0f52ffa53dd2aa5e"; + sha512 = "4c60276f146358a9de2b6c98cd54e0a10c9ae19ca20c2f4e5a6f86b0ca7f9b180604b58e085fda97be9e9457b3f7a1d36ce05ae2010e8a9b5a782679152cc4ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/is/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/is/firefox-56.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b4fde08b7dfb09bedb2fd9fb7e3a1876dbe07ad2eaf7a706bbcda18728d997dac192f736ebcec4c0f3cf0ca2b49804f49030222ce25612987b73539acd98bbf1"; + sha512 = "0c0ad6ed37d5ba059cda0fdf8c8cfbbdb3cb671a81c434d76feda7572d5f71ed4e05884d583d6ffc9a168f8176fabcf1de030d19f018a28e24a341bfe6ac5dd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/it/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/it/firefox-56.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ab91f86b0f8458e00fad441799056c396600d714316c0a1bf332253ad476c8a00a8b3c5634396fd70d60ff0ba32d6adb1a8ae3b2a01f42d1458b7796b0f09d84"; + sha512 = "80f9a72be17b90f7e81650246c6338bba58ddfeaf911e1f9b3b81137751b32ff90e2945cf700850a72951c582f2a6b1c2e20b024fc5589d0316f583e1c3040d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ja/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ja/firefox-56.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0b7e8d83b677ff51e8ab1c335d9befe05f3cee0444b0dce063b99516381697a985e5ce3d3b80b45ef563766166c65e7ff7d503c04240c44798a8a847ff66e05a"; + sha512 = "f4af35418ef0e77dd7deff58041775097ffdbffd98c0b6b8da5da672535db33caf30648aad020e3be360232105020fbdaa254bbb141166fbc4065446c828a915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ka/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ka/firefox-56.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c09b1b11629f242918d231a27a3dba59fc8198c0c0a4c5ac2e648be6caf08c0644e89c9452c47b5ab4690f967a67054c4637cc83db6bf64eb6d9d796d5927cd8"; + sha512 = "11f32a5b7a6b0e96728154769a71cc47741f7791610c327acf6e3e9929b09dc0d37feffa00d95d220e0fbed6c7daf4cc040bca86e3368523583f3b15affba9f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kab/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kab/firefox-56.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b78db07da52542eb646c484c567f36c3d56b8613c6ee183ab02735a45397e28dc8cf1da3d42bd5ed0326554c93a4e53f85993f27193df05ea383873ca9767252"; + sha512 = "80ed0a4fa480e89c8925c810bb80f1e43b8f26ed5fef4a8f641081ca59437b6069cca82f27d4437016c1767df00c307d48325a76dccf77d1cb434eecbdb41184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kk/firefox-56.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "dcb8a95db799748531fec235d1c348a5feb04b5a6ae86b93e3adb23b7f1142c4ce12f19c0007b34a9c0a7ecbf8760c476cf99398fb001810fb852c67883cec75"; + sha512 = "639eac112c2a1471d4178304371996314c4eef6567fb205b586bb3e1eb94f87e30e7b10e81027a620a4def25c5e71412f6ba6fa00414d38843873df80745811b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/km/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/km/firefox-56.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "23565ee1f7f0ba89821efdffae8bf2a615e11d8ff74b56425097ee4cdc6abe2795d81513cb7066165c445cbb44f4f8b0bbc1add77f23b797a372cd9068f8794a"; + sha512 = "f6c535a31dda743fa54985b5eeb97e3091243434923ebb75ed75ffb62350133f068251a17e1b2172ddc92dd3520e7d29af7276bfdc711760df855e850d6bcb5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/kn/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/kn/firefox-56.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4646c1431dbcd96f943268a1a80e87ecb94db9c9d71eca80383c26f02ff8e117b22aba03f4d829b0a381ec04e249b2533fb104a2609437bca7f6b78e143a5d41"; + sha512 = "07b371373494feca79ccba78df2706a9442a6d7ed743e8bdd94619ae1f0c814f66776d4d7f37fdc98a1d157d71a2d22450b5c3d6a39a84a15b63fd9911639f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ko/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ko/firefox-56.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "efd5b303fec5ab0be91dc457f383fd9cd14ba7f877d2be5b0133d9a8e7fc03b67cc0ebe9414c4ffa3859fa022656185cb78be955483bd749ffce258197b2ba64"; + sha512 = "a39ef1b093a707f1e6e1bd7bfd9affe4684b19bfba33a88e81f51040bb7bde29e9c4ed12a7d49c30959f9a0201a5504fbb3e8300cf738767739d93d92553651c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lij/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lij/firefox-56.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "611d457dee0be03eace5e51160466748770e82b4d71617f7cd4aa0e48935c73fbe4334a786d1055be869b32c61cc1c189138650062408e66a382dab12bf9afa9"; + sha512 = "9b4636d1520d94b5955e3f3feeb2aa91463f4e7bfae4cd63e102ff29a6ddbca091e7c27a45b31e14db00b3c2e3b49fff32abd7edbe5cbe6447a4544aadef9f20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lt/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lt/firefox-56.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c8760630354790f3c4d9964b594f4813d690ff30d62234c748c7c38758e4428873d55f7b54e5ba7f3c6008b0d5d14ff0b3e4de51d564d9c52b056eaf31753bc3"; + sha512 = "8196df53989aae3ad1ad326ae85b9e24d717e2668b28958e7478a40408aa12dfdebc0df77bee73b7d7bb60ff593d45e650b772b71c17446d38875c2157b61918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/lv/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/lv/firefox-56.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6b074f3f4ef5e1c349db0ddb5e9bdb275af226d10768eb40322c14ec8b4c8d0c6f300d89b20911350ed1bbf84d9e7c28d3d4ed74f7f5944a2a60e13460c1eb3c"; + sha512 = "288f37186f690c21e858cd89c0cffd0dacf1ae8a93b0c3edc9ef9a6438733dbd03f0418c14d9a779723acbbbe4c37a8f587d6ee64375de8d5b1a966df7962b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mai/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mai/firefox-56.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "4e9e84e48187535075a0a424c99c5a7d2b5ef1a30e5b86662e295b8116d64a5448588bb9e262edeaa03138ecad46ccaf388ef9d3b053315b3dc77efd08ab2c9f"; + sha512 = "5eee203c914db080e4809df94156f2d431f68c9bab5664c854cb66306e566ca6a45c4b6d683e7e543ceddc91d60964959b661d0a2da9b26f9b461a2e099a37f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mk/firefox-56.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "adf41bac2ede4a91ffb3f107ecbfd40e945ad1fe23b44cfd0907400c12e526b8181ade5155ffb669a5f9a3c2ce08d06a5feb49d7faddb51494b6c404372ed083"; + sha512 = "a5ad175c42bf938100b75012732053724edc1940e8ee759e2c248f8c394f5a23f3ec7964ffa282702a6d2eb5831c618457f823490b01c21723e4101b53a29024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ml/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ml/firefox-56.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "b7d2c89c066cb142ad45098c7580268c4ef6e53588a1cdda100d195047efb33b62ad0ae0c6092810b69799647201526bca3654f3256f82692a678ad357dbd950"; + sha512 = "dd45c351fc34dfc331c4ef9b475ed119dad87ea97be0d33dcafd013a3dfcc6b3975b4305fb4e3734a54b5378ebb8b354b7e91a4d89673f12c5b13ea4adab3287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/mr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/mr/firefox-56.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "932431c5cccbccf0bea43ba18e4463721c78a2d0b87bb53f89b2e3ce7d1d98ff0c22af78e1643010f7ad3a1c74c1ecfc302841b522d24000960711aa469835e5"; + sha512 = "19e6fb31009faed74fde46a969af17090629e5d32963cfc3e041ca0e77fcda09987b96fc109e8a399127794aec531d13a3406309bf84c29c27d8f8f3423de194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ms/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ms/firefox-56.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "594ea2dcf622aff32d66a8d7336ccfc96abf50429214ae0503c05377c9fc79ba35bad70e05f713b44127e6aba2ef09ae29c7187ec17470645d413b1d1a30924f"; + sha512 = "f34afc4cdfe9fe3d9c2836bbf0588fb39fa11c5b07a4acaddcd3ae44fb9c427f97b49b5579fe84b71b5f64ac3449fa8da9aff89de7395cf65c55b860d1148109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/my/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/my/firefox-56.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f7135ab56d292beeec62f075eb8e2a958adc95af848408b6d051992ca4def002ed6bbebd6f3733577ee9853bee99d346e6e749ef455aac4646bac3de9812c33d"; + sha512 = "f10f83c008ae871a53598232c6e1a524a21efd9eb669639d16229e340713a6959c0fedd01179c40cb91dccf33af2dc0e21c58ae901aea63d9c334e0a96d9f7a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nb-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nb-NO/firefox-56.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "82d1317e251b5c93b8c913a7a0a54b8582ad8a80fa242cf0d4e997f5d09615779a5b1a544a55a68feec2a49144f3a8e13be37a3f32caacfd7ffaae150ab8a4a6"; + sha512 = "0d09dbc8d16648108560f4a45d93b5ebf0ab008e920d060e5cf031cb3c734ac4e0bc0510daca96f016dd729f759a66b6c0ba856256110a47c015511bb203f732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nl/firefox-56.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d3ee1e58a46266688aab03a55846bd5cbc9ef96188cbc0c6a723088a71637390d14feb62dc5b1af48659b4bf41466ead9504d8c086eaf1a775d50f30d23982f4"; + sha512 = "4413018700d0040be812f9082e9502fdb56db522a06df336b9a070189c7ef0938a5d830a9072db3bb5e721d25a9a63d3b5105222ff6a808d3dc6fccb1ef193f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/nn-NO/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/nn-NO/firefox-56.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a07cec43e602baa4fba8ba23c76d820c3fb0a7698968d6324d49b3a2cd88541f9c54998a090be173bcb5b31f0de85c0e5700e83cfc91ca9e448a4886503a346"; + sha512 = "07a6fa48cee70d0cc97b6f6928e70b37be4e9de05e800a95aa1bcb733239129791568a11d75e1e2a647c6e08cb3ecec02979bf75b487ffc54fd11b46fc4d8a3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/or/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/or/firefox-56.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "5fbc52e53d63561249da9c3c33b28504fe7278bf91b218bb683d9d35fbd20ec94ffbb359e9d8ee2c3afa00f1f9bda0f13b07bcf266ccf1f19f647747b5b40b1b"; + sha512 = "4dd3449deedca5a13a26e05a6d13a3d4e2e414f9997f4873668daa03d09873e674ea98f79c98c48fbab86c9a3f32820f8e17eb1fc6111e5bc1ce73da5584eaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pa-IN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pa-IN/firefox-56.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a91a0569b9dd8f5cbbfa66b67f7d737a4cc5cd2178eaee9d5b243230672813caaa17483f10d831c0aba89a2dc97945588a7b06d016aed7c4f6ca5e4ba80cd0c1"; + sha512 = "b09bcd351a39c9c9cae213f18cd3ec49af8dd7d203a37f0ece99b54d7ad81aa711fc54b1b772502bcc071fa18a0a7f6af8d99b62bdc00437a0ef667d459426b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pl/firefox-56.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "fd2dd21020116fc81e91c2ad92827e58803d06ecb63069953f7a6d49321152dbbee83d84aee280f9a2306220986a4e56dca36f0df771e61e950389b0981b6058"; + sha512 = "910f5f8b9b34b20b4ed86f444c905171d23f459cc4a37f6fc700d5386a22758b51ffd8a9b3f747fe339f4be3a4967318c0bfb6f618c0602e8daf2369b6f95f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-BR/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-BR/firefox-56.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e1eacb5b8da228b881503b0e1e43de40b7dd6808690011fbef6c5b367ec7d9edf1ae7df8d2e65ce6239a00a5b20296739dccc8086fbbd3634ae7153f2704a847"; + sha512 = "ea5b6fcde8864aad6a3e005e5cd46e9e4c26b6de1b1bca8490e10ed2f7c7bbf44d93105c64c280327485b3537ca1354e8ea2749328a536a06fd0e34b70990ee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/pt-PT/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/pt-PT/firefox-56.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "240094ce50b49a3537cb5b6e80dd2381309ea7684eacd5b7fa207f097b75728d48041ed0ce7eced5ae6da20ab769d4d8730eef0dacf534d5b1dc701730937503"; + sha512 = "4bf071edcbd35a2b556d3593a70df66024f871a49abf32812c2e25cf3a9fb466ae87e6a958a5299c54972c68807b8154995eb7bc268bdb8cfffe32cd80f96b88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/rm/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/rm/firefox-56.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "78191dbb18f1cd6ab2425ad6ba38402fe98e20888fea662b3b6c347751de512439bb3cf349ffb2daaba93011cd33a2cecd6e383a45800224ccf9443ca4c2075b"; + sha512 = "7dfe47e52cc71504cd1f4682bfed645a1fa1b622cf75f07cb650f8c42863cc9b5cb0d4b10c74e1e075c95155df8a52a08ddd4b13da45fc99e4c453a0c46845f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ro/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ro/firefox-56.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b62b8c628864e176eddf410a402dcb5e39bec295ce97891b054b13727591cdf4ccd2973825e513929808c67a7519cd3aa550040eb359dea18b97bb4f01ea3dd8"; + sha512 = "25fc42b92545f9219bd4d1502bd05b3ab848b590118fbc9d44dde00cd64e033016aba7eb2918de1d5a80e307b9743cd508567f076bc3de1eec2af966b126f574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ru/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ru/firefox-56.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "51e61b637de95df9a400416546003fa5105390acd48aa1f8a3511b39fab76c83a6ba3d41cd5b15148837ea2df295dff06ef7baabaf44994130f0be73af4e13d7"; + sha512 = "fdb9d2c7fd6708231b2b5b617a7d89698d77167a53e21cea7bd0da47b32bdfb5858e8c74c616e7265cac7095652829eb26e73d91c0949c3a11f238637bba56d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/si/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/si/firefox-56.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "3ff9503a991fc935cc7f0afbf69f76b1cb0ad68c21348bb9034c6af6e262fc87f49ffc0025702846b0c85d72b371cd573ad3147fa9dadf04ba846b22033aac62"; + sha512 = "60663c3a8e66d416015dcb80b01eb991b28f7e0715a24d1fa3f1725bacd7d02360eaec1b7e75257a06cfc8bb9a7a960d654e52a9a128490df5c1821514388d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sk/firefox-56.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4d574e1381c689f847b1d2be8f8f8e5d31d9e3e7765da00ae44d801716bfad56c1cdf18824bc203b6ca8124e9ab598b938c9082b57482146cbb7dfd6607bdb3c"; + sha512 = "c0774271d098dc55be6154d2f687b4dc0018b359a4fab9a073818f0333c9a513a4f5934aa33948d40f59f10f79812741206eca43804ef3e1c9bba5a386355db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sl/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sl/firefox-56.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a960a47cd5349e6c7073052672273c8a889e3d8650453f99ff118313ad692e9a0ae5ff8777ac52fc69a40e24665064d03e4cff4942796d554b75a1e4168f5790"; + sha512 = "8a87e18213b70b0e25ba89fded209d2d0782f844f492fdf8f0d3beaa35d3c67ed3a537418c14c2e68ee3b20fd829475bfa763ccadad0b4ff06046dd0127927ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/son/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/son/firefox-56.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c2a18b625ca95c4e4070409bf7a4bf42d0338c6b4c8065938297b4c0834c7018271e8d6001b8fde382719ca313d5ebae9dd811499e84e1ee917c8b3a512f8534"; + sha512 = "bd84d6da25363521111b7dbe1153cfdc1b17a5eced2ade76a841c60cbe11a00d274b9a556f5320698a1ee846faaad5ceb42bd79e0164e14efadcf31796244bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sq/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sq/firefox-56.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "588076f33cab37b746ef25362a55c1cd8455a1c4ebf55dcf079b16b19cd7dd77a9c1cd57496117b5c3fb3907b1b047649f4e6f6eb0ed2e0e034ffa291e6f9b91"; + sha512 = "955f7b8b8bc497325dfdfea24264c6784907f86340cdec78ffa01a79a10bd58154341960f0e6fcdc1504d9b5cd7d44b7b3ef9be348695b47089701a7e1c832b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sr/firefox-56.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "995b5a57fdb617f1b8ceecbdd22ee408e4d83b73ed5b2cc49abda0a4de5d6ca0d5bd54346efcbb2d181b5a77d978e4611e7235bf66b3c501dc25785a4afb737b"; + sha512 = "85562676547412364aa8043b9e4cada72b46e078628686fddab5444c7a8d5fd8d363d0429efa67478d290cc1671b52948095a75566e98993f49c04cda3f20881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/sv-SE/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/sv-SE/firefox-56.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "050c87742013c5de08d072171a10ff365ac50f2900c65039f3ed699b206a684323bd08c7941027eb6f6f7862ba8bd7011054e83f92fb0a9e9a3f208bd1e4617a"; + sha512 = "4a7aae7ae216e3db74f2f77bb747e06f69abbda483e2cb59bf7906e23b18b612461e08b5360abadec61ccb5ad39d536453376db35dd130df5d5173807a9ecc06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ta/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ta/firefox-56.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8ba9e5eceb691c34c067a620167de35a130c3cbf67f0dd5417c27915b507891939d9080c9b7b3616ce939a17c153c8204639b7e3b431d564d43f79783a61b857"; + sha512 = "510eec52d5d41e3ac7e7759d78e572ce2b7d7235d39e3cd01925dbc43c71f46d6b90493db27a45f6a36a50089173f70a301591b00ade07372ee08a2fcdeba2f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/te/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/te/firefox-56.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "c57380183538fd0a54a98f6fc9a9ad2a37c8a26f7beea65967b18ace44b88d2231a3509e643204322bd2c8111b8e9edd176a0712a32b34e4078c686a3b138bb9"; + sha512 = "8c0936ccc1a92126573495e5747f6739c0995fb7280e686b31fa62e6c2c7a6527aba36c9ec1043cb5a3244fac368c899b9ac5afa30b0d121fbe97d1a9a41d7ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/th/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/th/firefox-56.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "bb9c8c108ba03016bffbcdc66dd5972df779c55349db431acc289ce2e8d299b930e9f17c8e3eac04b17a50e3e226eb73df91b8de0ee690915de8b3dccd7ddb2d"; + sha512 = "ca7f55274ff6171f297904d9be0451294cfdf9fef93bccf51f8880e3b69237daa9058de6f8e272b754d85fedbd69144cb1337b653f47029a212fbc938bcca9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/tr/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/tr/firefox-56.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2bb15f16c35021a319ea79b653185fc87e81fb55764eda65f78d049dfc876c3b95828fab69bbf7521738cb2107e8cf16c2bae40332d2ce891aefc086ec582b30"; + sha512 = "b82558a077b562b485984d3864966135d5be8fd27a1b266d59beb4e2f1cc556b40d29133c63f3666eaf22f7eeb174fdf4f16e0e0804ae73a68e57f16f5d900aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uk/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uk/firefox-56.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bcb377c223a8f969b78832ce581dd4f21c4ef08409445faf3409651ec28f66361d8fda763104a6e39590e2e02ced75d7d0554d643e96a33784d471e9f1aba06a"; + sha512 = "7f291c45f4b5569b3cac12f91538073a1c4e52be473c2e6b9c7974dfddaf85696c78f3b08849d960f1fbbac7d6f750d1e1cfd22993daeca1ebb2cbe3c98b0002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/ur/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/ur/firefox-56.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "dfe75ccf52fa8a9d96309162e6499074446c609664a2d0971b9a7a0d64ccd4923494975af8d9b1710d7d5093b259d4ec56f43faeca331fbaf2c435f3cd5ed406"; + sha512 = "733a8362e3abe0b7cd6fa94bec4dec3f317ccb08cece1c495ef712f0764f732878880a3cb5b90c54fa67bbf9531b1e4ceb8cf888e3b505f955252ee7f9e46390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/uz/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/uz/firefox-56.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "81618bda3809d1c489fdd03be8aeb440a7963464efc381664d6ebeae5d106cc36008977592a16ad629711a00a731f25cd651f789f84260add8f272cb7f6d39e0"; + sha512 = "d5e35145dc54462297e48fe8f4ef1e743ee9b164c9cf45604f293cd2d1433908ef26b3460d961669472c061a2572c655beee9d9c44ecadb153e1ad5bcc161e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/vi/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/vi/firefox-56.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "08d962b2ba18586e8bfc32d55ff800ce86125d59a7bdf6e6cb554b76d069aca86835cbe3985ff23c0462ab9f65758a12a0bcece39ce192d37d2eb2b66db8eaa6"; + sha512 = "428950b7fb6152de6fe8beb1b1e8f42a5d0d112b20be1a502fed6534441c4fb3fdf2e30b45e71f2d463aa622657ef3784730204af8e853de0847a68332450144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/xh/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/xh/firefox-56.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fdf12790a573445cd48c5313579cb3d4016cde9ff8283c5adb63c7e51b6e2b42aa855f331842ecaf62c99c30641ed7b8531e9b2fefa3de1ee03530bafb12ee30"; + sha512 = "6127dac54537eb2fcc689acb20ce1ecfa8c8ace6f9c62b6f096b2bb4d9c7d47a70fedb9891afc1f5e0ec286ae8d04e677ab833e6fa534a8f8d4a728977624694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-CN/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-CN/firefox-56.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e828b745ee8526a2acea5a701982240172050342e0df0efc15dd87dfaea0271d42f7bc06435d4bc4af657f725462de49df8232d985debe15514d19d50b184663"; + sha512 = "648ba81769c529476ef7a5875a518ce5aeb49466af86b5d07e411adf7abbab4f90134ae994e3009dd62767aee0376973b08247c8222bfc6359e4cff6b8a19918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/56.0/linux-i686/zh-TW/firefox-56.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.1/linux-i686/zh-TW/firefox-56.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1b058d91c7b8d242238bd8411bfb339e2712b6c550329bd06fac837faf453320310cf0d11597e9ca6d5d9abf084ad761a6701deeb6673547fcd60a094c6452f"; + sha512 = "230ea83c02b46c856f35ff15c6e9ece08e55b4407dc9e65411e92e1f6a8db15fadc3da44ae8a610b9ab96bf29a052c1d42a8b75d7346d242e8a9135b62e5ab09"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index de19e6118511..1b72f9e18c30 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,8 +8,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, icu, libpng, jemalloc -, autoconf213, which, gnused, cargo, rustc - +, autoconf213, which, gnused, cargo, rustc, llvmPackages , debugBuild ? false ### optionals @@ -50,6 +49,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation (rec { @@ -74,6 +74,8 @@ stdenv.mkDerivation (rec { ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optional gtk3Support gtk3; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook; @@ -88,6 +90,12 @@ stdenv.mkDerivation (rec { make -f client.mk configure-files configureScript="$(realpath ./configure)" + + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + cd obj-* '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. @@ -120,6 +128,10 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] + ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [ + "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e2a8e201fef7..4b3322140419 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "55.0.3"; + version = "56.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416"; + sha512 = "6a07de6bfb71ccdef04b0f2ced720e309d037dd89fe983178ac59ea972147360552e2b8e33d8caa476008cabf53a99003807b0e817150b7a39e0bc143d82b88f"; }; patches = @@ -32,10 +32,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.3.0esr"; + version = "52.4.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9"; + sha512 = "be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183"; }; meta = firefox.meta // { diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index 7383e0ec0445..e013f54a39ea 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg"; }; - buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix index 1a0752c33c62..48d06d644dda 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { cd src ''; - buildInputs = [ gtk2 openssl pcsclite pkgconfig opensc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 openssl pcsclite opensc ]; buildPhase = '' sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 81a05b360162..30bae8792c2e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; - buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 07e152e91dbc..a5bfda9f26c9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { '' else ""); - buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ browser (browser.gtk) libXpm gettext ]; installPhase = '' mkdir -p $out/lib/mozilla/plugins diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index b3382ef05127..008c35964832 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { export configureFlags="$configureFlags --target-cpu=$(uname -m)" ''; - buildInputs = [which pkgconfig file glib gtk2 gtk3 curl libXt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [which file glib gtk2 gtk3 curl libXt]; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 29a73beeec8f..c9c67c015992 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.5"; + version = "7.0.6"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1ixa1pmh3fm82gwzkm7r3gbly1lrihpvk1irmpc8b8zsi2s49ghd"; + sha256 = "11z3r0577p78ifi9lk4lrh9wb46k77wy77g5p9l8il02760bgq6m"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1kb0m4xikxcgj03h6l0ch5d53i8hxdacwm7q745a377g44q84nzb"; + sha256 = "1r8v5w66clmm76kzpkf0f5jcxs76whb5xrl20rkirp79fybqn4hx"; }; }; in diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 0e9610247c8c..508ab6ec432e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -36,6 +36,9 @@ , python27Packages , rsync +# Pluggable transports +, obfsproxy + # Customization , extraPrefs ? "" , extraExtensions ? [ ] @@ -165,8 +168,27 @@ stdenv.mkDerivation rec { >> $TBDATA_PATH/torrc-defaults cat \ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ + $bundleData/PTConfigs/bridge_prefs.js \ >> defaults/pref/extension-overrides.js + # Configure geoip + # + # tor-launcher insists on resolving geoip data relative to torrc-defaults + # (and passes them directly on the tor command-line). + # + # Write the paths into torrc-defaults anyway, otherwise they'll be + # captured in the runtime torrc. + ln -s -t $TBDATA_PATH ${tor.geoip}/share/tor/geoip{,6} + cat >>$TBDATA_PATH/torrc-defaults <<EOF + GeoIPFile $TBDATA_IN_STORE/geoip + GeoIPv6File $TBDATA_IN_STORE/geoip6 + EOF + + # Configure pluggable transports + cat >>$TBDATA_PATH/torrc-defaults <<EOF + ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed + EOF + # Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \ -e "s,<dir>fonts</dir>,<dir>${fontsDir}</dir>," \ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 88ec2ad95093..53c278bc0650 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -16,15 +16,15 @@ { https-everywhere = stdenv.mkDerivation rec { name = "https-everywhere-${version}"; - version = "5.2.21"; + version = "2017.9.12"; extid = "https-everywhere-eff@eff.org"; src = fetchgit { url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; - sha256 = "0z9madihh4b4z4blvfmh6w1hsv8afyi0x7b243nciq9r4w55xgfa"; - fetchSubmodules = true; + sha256 = "179429pngyksp9xkr86nf2m5q6zmg19c7ng1dhqjfb1vsncwgw66"; + fetchSubmodules = true; # for translations, TODO: remove }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 28a4de16ea05..c654723f4c2c 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; }; - buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 162ad8533bdc..abb7013d1062 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; }; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e7641eb773dc..f65e2fe1851b 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { }) ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; - buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses boehmgc gettext zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses ++ optional graphicsSupport imlib2 diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index a73ec99cb9fb..5d47302960f7 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -15,7 +15,8 @@ buildGoPackage rec { sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p"; }; - buildInputs = [ libvirt pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; meta = with stdenv.lib; { homepage = https://github.com/dhiltgen/docker-machine-kvm; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix new file mode 100644 index 000000000000..7f17bd57c194 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.5.0"; in + +buildGoPackage { + name = "kubecfg-${version}"; + + src = fetchFromGitHub { + owner = "ksonnet"; + repo = "kubecfg"; + rev = "v${version}"; + sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93"; + }; + + goPackagePath = "github.com/ksonnet/kubecfg"; + + meta = { + description = "A tool for managing Kubernetes resources as code"; + homepage = https://github.com/ksonnet/kubecfg; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index cc7a93bdb537..e6e3585a4d13 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -91,8 +91,8 @@ in { }; terraform_0_10 = pluggable (generic { - version = "0.10.2"; - sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502"; + version = "0.10.7"; + sha256 = "0gjvrra255m973nzi7rpqp5dn5npnd79cnv8vjcs7wmkdj1hli0l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 0778e221c125..d29bd9648609 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "0.1.0"; - sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri"; + version = "1.0.0"; + sha256 = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn"; }; arukas = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "0.1.4"; - sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8"; + version = "1.0.0"; + sha256 = "1x3ldlx2iryxwfaws8ng9n0k06p7n8xqc6sjyxw73jdasxbh8wgi"; }; azure = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "0.1.6"; - sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6"; + version = "0.2.2"; + sha256 = "1jdkj1zylrlcd2qkfkl81i0ybdpmvbvvsk0f4ahafiqp550srf2d"; }; bitbucket = { @@ -102,15 +102,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - version = "0.1.0"; - sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94"; + version = "1.0.0"; + sha256 = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "0.1.0"; - sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk"; + version = "0.1.1"; + sha256 = "0nyqybi3fl9qlhpx2n0vjz7kn3bqhf4wy93zhq3j3853zxpcjpzc"; }; digitalocean = { @@ -130,8 +130,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-dns"; - version = "0.1.1"; - sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n"; + version = "1.0.0"; + sha256 = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2"; }; dnsimple = { @@ -151,15 +151,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-dyn"; - version = "0.1.0"; - sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p"; + version = "1.0.0"; + sha256 = "0ph3516syca8f1zxmz66mh6y5kd8sc74kl0n8zixcgd6rvq0dysr"; }; external = { owner = "terraform-providers"; repo = "terraform-provider-external"; - version = "0.1.0"; - sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza"; + version = "1.0.0"; + sha256 = "1sh0m8d6wp76h1b89j820yl3caji0f0wlgq3pwa5nk99h73rlndn"; }; fastly = { @@ -186,8 +186,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "0.1.3"; - sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf"; + version = "1.0.1"; + sha256 = "0l0bpcfjnzlgf3g60iyfr3axw0244w99cf04z7y3bcszk5njipri"; }; grafana = { @@ -207,8 +207,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-http"; - version = "0.1.0"; - sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah"; + version = "1.0.0"; + sha256 = "1lks997sxfydm6a9s6vfyljs3j1r7qpg1k1s5ilpg5ckv77nad6g"; }; icinga2 = { @@ -221,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ignition"; - version = "0.2.0"; - sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7"; + version = "1.0.0"; + sha256 = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4"; }; influxdb = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "0.1.0"; - sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq"; + version = "1.0.0"; + sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd"; }; logentries = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "0.1.0"; - sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8"; + version = "1.0.0"; + sha256 = "01fvw7yw8dhjclipnn9h1blagbp2849ahmnqj3ysh13i0x1qbq4r"; }; ns1 = { @@ -298,8 +298,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-null"; - version = "0.1.0"; - sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp"; + version = "1.0.0"; + sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha"; }; oneandone = { @@ -312,15 +312,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "0.1.2"; - sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i"; + version = "0.1.3"; + sha256 = "00h531pikjrmra2sr24lnx2z0dvycshd0qpz3wa733mkvvm47p07"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "0.2.1"; - sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca"; + version = "0.2.2"; + sha256 = "1027pqv1cvyvakn4kgivd720g9na38nam5bb5fjyd4d04xpq9v90"; }; opsgenie = { @@ -340,8 +340,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "0.1.0"; - sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0"; + version = "1.0.0"; + sha256 = "0ibz9k1yfqkfsmqmv1pl2jwzbld0l6f7zd8y80iw0v5wswclswya"; }; pagerduty = { @@ -375,22 +375,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - version = "0.1.0"; - sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp"; + version = "0.2.0"; + sha256 = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im"; }; rancher = { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "0.2.0"; - sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg"; + version = "1.0.0"; + sha256 = "1fs8p0l8f79b1s2g0p5zlq1has9i7w3bmv76vrm79076v7w2v0d6"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "0.1.0"; - sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5"; + version = "1.0.0"; + sha256 = "0im4dsnbpbc9qln92lxcrygm9d705bvlhigpx492172cq1fqnw61"; }; rundeck = { @@ -431,29 +431,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-template"; - version = "0.1.1"; - sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn"; + version = "1.0.0"; + sha256 = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz"; }; terraform = { owner = "terraform-providers"; repo = "terraform-provider-terraform"; - version = "0.1.0"; - sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz"; + version = "1.0.0"; + sha256 = "0icyyi4h48yh5235p5svm4p0jzbqqm1f3846dqy37czhjfcrn3gh"; }; tls = { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "0.1.0"; - sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7"; + version = "1.0.0"; + sha256 = "063ai5zipmkwq0nr5c25gqsr970r8aba12ynxg9x8cnay0zn9s95"; }; triton = { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.1.2"; - sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw"; + version = "0.2.1"; + sha256 = "0ds2anr65xx9kdjv6x68lcxgl3js6l0m2cbx3kwx5465m01m3gxz"; }; ultradns = { @@ -480,7 +480,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "0.2.2"; - sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz"; + version = "0.4.1"; + sha256 = "0afxvjx9zb9ym0cs8j15s6nfp20rmmifjdc098wcfjmgnw6p7f01"; }; } diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 18c55c80fc08..d3141675b418 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; }; - buildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b9dae2d42006..0972cc759aba 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,10 +24,10 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "35.4.20"; + version = "36.4.22"; sha256 = { - "x86_64-linux" = "09qxr94bcyjn5ky20yapljxi2n2nbk6ldcpx2h0ysy8jp6zbrn78"; - "i686-linux" = "1rd4b26dbjf779g085si65lac74bk6lcx8k7i3nqk3vrvbva9n40"; + "x86_64-linux" = "0hhnigwxqmr00zmlysc1y1k4bzrdrcabcnw44bniarwa2l4fw0v0"; + "i686-linux" = "15l7m33b0qlz8m6h7kh1fkxs37dq8jqy04b3qf693ns7wb5l0sqm"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = { diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index bec700367da8..5aa1649ff5f8 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.0.3"; - previewVersion = "2.1.0rc1"; + previewVersion = "2.1.0rc2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -16,7 +16,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0rmvanzc0fjw9giqwnf98yc49cxaz637w8b865dv08lcf1fg9j8l"; + sha256Hash = "1frfhys5s5lnqzk216y3wj2pli5g3b5imfzcmddxdcibksx13i17"; }; serverStable = mkServer { @@ -25,6 +25,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "181689fpjxq4hy2lyxk4zciqhgnhj5srvb4xsxdlbf68n89fj2zf"; + sha256Hash = "0vm4hir8yqj7xhykgg3x5rv1nj1qq6sg19sjj7r5w60brrlsw7v9"; }; } diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index f5406d9fe629..c2d17fd3308d 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg"; }; - buildInputs = [zlib openssl libre librem pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [zlib openssl libre librem cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 61e7203a83c5..fd05948864c0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7"; }; - buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib libgcrypt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ca8d7f2076ec..5146f3a0e391 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - guile pkgconfig glib loudmouth gmp libidn readline libtool + guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson texinfo autoconf automake ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index bc6e7a5f7def..6545b90980e3 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,14 +3,14 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-05-24"; + version = "2017-08-17"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "49a326d5696aa24f3ac18534c8860e03d0d58548"; - sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k"; + rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5"; + sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 904002c3b442..d5595fc85aff 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn"; }; - buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon ]; configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index dcffa2f14f46..607fdbc7e3e1 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; - buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 8bf940093357..60fd5af0a1ab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; - buildInputs = [ libxml2 pidgin pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 pidgin ]; meta = with stdenv.lib; { homepage = https://github.com/gkdr/carbons; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index f68b8306fc84..53d1f30bee6a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sourceRoot = "skype4pidgin-${version}-src/skypeweb"; - buildInputs = [ pkgconfig pidgin json_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 6e96719fd896..632f2543f57c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -52,7 +52,8 @@ in stdenv.mkDerivation rec { cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/ ''; - buildInputs = [pidgin glib json_glib mercurial autoreconfHook]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [pidgin glib json_glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index bb1ed52baba3..d02c437945e0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 8190be65e75b..002d0345a000 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -20,7 +20,8 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ trousers gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 68f632d4b6f7..79fb9b5c7f92 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig readline libuuid libmesode + readline libuuid libmesode glib openssl expat ncurses libotr curl ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ] diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index a2510c777385..08625d321235 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { name = "quaternion-git-${version}"; - version = "2017-06-29"; + version = "2017-10-07"; # quaternion and tensor share the same libqmatrixclient library as a git submodule # @@ -13,8 +13,8 @@ mkDerivation rec { src = fetchgit { url = "https://github.com/QMatrixClient/Quaternion.git"; - rev = "1febc0178fd3d02b7426f58981b54924ad60c84d"; - sha256 = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr"; + rev = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332"; + sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index df85c55dbee0..dca7d1257f65 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; - buildInputs = [ perl pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl glib ncurses ]; meta = { homepage = http://silcnet.org/; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 05ea0fda8353..b4fd71b01d44 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 37d5ea2e17b8..0bd6c2e5f2b5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,11 +12,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; - nativeBuildInputs = [ libxslt ]; - configureFlags = "--enable-call"; preFixup = '' diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix new file mode 100644 index 000000000000..6a4afdb1c17d --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ipfs-migrator-${version}"; + version = "6"; + + goPackagePath = "github.com/ipfs/fs-repo-migrations"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "fs-repo-migrations"; + rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b"; + sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn"; + }; + + patches = [ ./lru-repo-path-fix.patch ]; + + meta = with stdenv.lib; { + description = "Migration tool for ipfs repositories"; + homepage = https://ipfs.io/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix new file mode 100644 index 000000000000..2d52ca0ef70a --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = https://github.com/dustin/go-humanize; + rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa"; + sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj"; + }; + } + { + goPackagePath = "github.com/jbenet/goprocess"; + fetch = { + type = "git"; + url = https://github.com/jbenet/goprocess; + rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; + sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + fetch = { + type = "git"; + url = https://github.com/jbenet/go-random; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + fetch = { + type = "git"; + url = https://github.com/jbenet/go-random-files; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = https://github.com/hashicorp/golang-lru; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "71a035914f99bb58fe82eac0f1289f10963d876c"; + sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm"; + }; + } +] diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch new file mode 100644 index 000000000000..a933a7b5358b --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch @@ -0,0 +1,13 @@ +diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go +index 7eb18eb..cd8dcb7 100644 +--- a/ipfs-1-to-2/go-datastore/lru/datastore.go ++++ b/ipfs-1-to-2/go-datastore/lru/datastore.go +@@ -3,7 +3,7 @@ package lru + import ( + "errors" + +- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru" ++ lru "github.com/hashicorp/golang-lru" + + ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore" + dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query" diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index ba0f557d0ffc..2c38965e100a 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.10"; - rev = "4679f806bd00c0a5299c22c82d1fbfdbad928e6d"; + version = "0.4.11"; + rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1khlsahv9vqx3h2smif5wdyb56jrza415hqid7883pqimfi66g3x"; + sha256 = "1n8xr9xg23wm255zjm7nxd761xapmsv11a0giks2gaibh4nps1jl"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1j3az0nhjisb5dxp1a4g8w17y17xjikvcsy4qrg0fm43ybpkhhvw"; + sha256 = "1qi87sq490xpj4mip1d30x4v77gkacnw4idm0mwla92pg44v6wh9"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 64e3d216ac08..aefc48d4a3ee 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { cp src/.libs/libfish.so $out/lib/irssi/modules ''; - buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { homepage = https://github.com/falsovsky/FiSH-irssi; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 1141f5639181..8d7bf677983c 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preConfigure = "sh ./bootstrap"; - buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libotr automake autoconf libtool glib irssi ]; NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/"; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index ad571888a9ca..109ab2417af3 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qtsvg boost qwt6 ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index d28144f92ba8..2c1678e994fb 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig lua5_2 file ncurses gmime pcre-cpp + lua5_2 file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index ae6033556faf..f5d48d03c96a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk"; }; - buildInputs = [ pkgconfig glib notmuch ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib notmuch ]; # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25 patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 74e43a728d7f..93d180a327b7 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gnupg # undefined dependencies + gnupg # undefined dependencies xapian gmime talloc zlib # dependencies described in INSTALL doxygen perl # (optional) api docs pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index c008c478d22b..b865622efe42 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${name}.tar.gz"; sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1"; }; - buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ed811cf82ae1..7ac8091e1c11 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.3.0"; + version = "52.4.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234"; + sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e"; + sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63"; + sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c"; + sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7"; + sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d"; + sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b"; + sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f"; + sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1"; + sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6"; + sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b"; + sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a"; + sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884"; + sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69"; + sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb"; + sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a"; + sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544"; + sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4"; + sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488"; + sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd"; + sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1"; + sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e"; + sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec"; + sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22"; + sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5"; + sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2"; + sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194"; + sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe"; + sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418"; + sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20"; + sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353"; + sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e"; + sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225"; + sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9"; + sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783"; + sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615"; + sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a"; + sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207"; + sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65"; + sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083"; + sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b"; + sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f"; + sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4"; + sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de"; + sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f"; + sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976"; + sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525"; + sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95"; + sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876"; + sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6"; + sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82"; + sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad"; + sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b"; + sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3"; + sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5"; + sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b"; + sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6"; + sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2"; + sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd"; + sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4"; + sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca"; + sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148"; + sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640"; + sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9"; + sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3"; + sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257"; + sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564"; + sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b"; + sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9"; + sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9"; + sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f"; + sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240"; + sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8"; + sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207"; + sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067"; + sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c"; + sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40"; + sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052"; + sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf"; + sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435"; + sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126"; + sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef"; + sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4"; + sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58"; + sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46"; + sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7"; + sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc"; + sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f"; + sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2"; + sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21"; + sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379"; + sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b"; + sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba"; + sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea"; + sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b"; + sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839"; + sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537"; + sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070"; + sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7"; + sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53"; + sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1"; + sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f"; + sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16"; + sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b"; + sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd"; + sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d"; + sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2"; + sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a"; + sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f"; + sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb"; + sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8"; + sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf"; + sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a"; + sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b"; + sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d"; + sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5"; + sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0"; + sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9"; + sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 51d90d11707f..2e1f8ed50701 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.3.0"; + version = "52.4.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66"; + sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 8c0bb8a884f8..63d7f29d7de6 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; }; - buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index e8df906217a0..48b2d883849b 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; }; - buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 3a6a71843a2d..a33f85551f3d 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig unzip fpc lazarus stdenv.cc + unzip fpc lazarus stdenv.cc libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 6feeacc675a0..9b448f86736d 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index e5a242662ce1..d30527ca6093 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig python2 + autoconf automake libtool python2 boost db openssl geoip miniupnpc libiconv ]; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 5e675c148bcd..6b765a0c9f16 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ncurses autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 66e0cef23f5b..5cbee68551e5 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation { sha256 = "1vfg8sfpj83ircp7ny6xsbn2ba5xbp3xrdl5wwyfcg1zrpdmi7f1"; }; - buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas glib gtk3 gettext libxkbfile libgnome_keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 5bc5bafe7db8..f01a36cc65f5 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--disable-scrollkeeper" ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils + libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils scrollkeeper libxslt ]; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 21bb95d45e8f..803e35307fe9 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; - buildInputs = [ pkgconfig libpcap ncurses expat pcre libnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap ncurses expat pcre libnl ]; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ -e 's/-g $(INSTGRP)//' \ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 20a0f947f105..4844c83cd14e 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation { cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; nativeBuildInputs = [ - bison cmake extra-cmake-modules flex + bison cmake extra-cmake-modules flex pkgconfig ] ++ optional withGtk wrapGAppsHook; buildInputs = [ - gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt + gettext pcre perl libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index d28c162874ec..79bc32dfa40d 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; }; - buildInputs = [autoreconfHook bison]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ bison]; meta = { description = "High performance TCP and WebSocket load generator and sink"; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 550445f73068..a1fe790b1190 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; }; - buildInputs = [ autoreconfHook openssl protobufc libconfig ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl protobufc libconfig ]; configureFlags = [ "--with-ssl=openssl" diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix new file mode 100644 index 000000000000..76027f29a707 --- /dev/null +++ b/pkgs/applications/office/calligra/2.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen +, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg +, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql +, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs +, kactivities, okular, git, oxygen-icons5, makeWrapper +# TODO: not found +#, xbase, openjpeg +# TODO: package libWPS, Spnav, m2mml, LibEtonyek +}: + +stdenv.mkDerivation rec { + name = "calligra-2.9.11"; + + src = fetchurl { + url = "mirror://kde/stable/${name}/${name}.tar.xz"; + sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + }; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + + buildInputs = [ + kdelibs4 lcms2 libpng eigen + exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg + libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql + freetds fftw glew libkdcraw opencolorio kdepimlibs + kactivities okular git + ]; + + enableParallelBuilding = true; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix PATH ':' "${pstoedit.out}/bin" \ + --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + done + ''; + + meta = with stdenv.lib; { + description = "A suite of productivity applications"; + longDescription = '' + Calligra Suite is a set of applications written to help + you to accomplish your work. Calligra includes efficient + and capable office components: Words for text processing, + Sheets for computations, Stage for presentations, Plan for + planning, Flow for flowcharts, Kexi for database creation, + Krita for painting and raster drawing, and Karbon for + vector graphics. + ''; + homepage = http://calligra.org; + maintainers = with maintainers; [ phreedom ebzzry ]; + inherit (kdelibs4.meta) platforms; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 76027f29a707..bec19d675cb0 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,55 +1,65 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen -, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg -, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql -, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs -, kactivities, okular, git, oxygen-icons5, makeWrapper -# TODO: not found -#, xbase, openjpeg -# TODO: package libWPS, Spnav, m2mml, LibEtonyek +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + boost, qtwebkit, qtx11extras, shared_mime_info, + breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, + kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, + kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, + knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, + kwindowsystem, kxmlgui, sonnet, threadweaver, + kcontacts, akonadi, akonadi-calendar, akonadi-contacts, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, + poppler, pstoedit, qca-qt5, vc +# TODO: package Spnav, m2mml LibEtonyek, Libqgit2 }: -stdenv.mkDerivation rec { - name = "calligra-2.9.11"; +mkDerivation rec { + pname = "calligra"; + version = "3.0.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; + url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - kdelibs4 lcms2 libpng eigen - exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg - libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql - freetds fftw glew libkdcraw opencolorio kdepimlibs - kactivities okular git + boost qtwebkit qtx11extras shared_mime_info + kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews + kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts + ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver + kcontacts akonadi akonadi-calendar akonadi-contacts + eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; - enableParallelBuilding = true; + propagatedUserEnvPkgs = [ kproperty ]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for i in $out/bin/*; do wrapProgram $i \ --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share" + --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A suite of productivity applications"; longDescription = '' Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing, - Sheets for computations, Stage for presentations, Plan for - planning, Flow for flowcharts, Kexi for database creation, - Krita for painting and raster drawing, and Karbon for + Sheets for computations, Plan for planning, and Karbon for vector graphics. ''; - homepage = http://calligra.org; - maintainers = with maintainers; [ phreedom ebzzry ]; - inherit (kdelibs4.meta) platforms; - license = licenses.gpl2; + homepage = https://www.calligra.org/; + maintainers = with maintainers; [ phreedom ebzzry zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 4ed150813127..f6c4728eb531 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml + libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 69a96c6148e1..c6458e477186 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -25,9 +25,11 @@ in stdenv.mkDerivation rec { --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1} ''; + nativeBuildInputs = [ pkgconfig ]; + # ToDo: optional libgda, introspection? buildInputs = [ - pkgconfig intltool perl perlXMLParser bison + intltool perl perlXMLParser bison goffice gtk3 makeWrapper gnome3.defaultIconTheme python pygobject3 itstool ]; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix new file mode 100644 index 000000000000..66aee6bd9628 --- /dev/null +++ b/pkgs/applications/office/kexi/default.nix @@ -0,0 +1,47 @@ +{ + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + boost, qttools, qtwebkit, + breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, + kwidgetsaddons, kxmlgui, + kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql +}: + +mkDerivation rec { + pname = "kexi"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + boost qttools qtwebkit + breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons + kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets + kwidgetsaddons kxmlgui + kdb kproperty kreport lcms2 libmysql marble postgresql + ]; + + propagatedUserEnvPkgs = [ kproperty ]; + + meta = with lib; { + description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; + longDescription = '' + Kexi is a visual database applications creator. + It can be used for creating database schemas, + inserting data, performing queries, and processing data. + Forms can be created to provide a custom interface to your data. + All database objects - tables, queries and forms - are stored in the database, + making it easy to share data and design. + ''; + homepage = http://kexi-project.org/; + maintainers = with maintainers; [ zraexy ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; + }; +} diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 28760602575f..b59d55d3ea08 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf cairo clutter_gtk ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 674aa666b7e6..fe6a3a41a236 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation { sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; }; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua perl autoreconfHook ]; patchPhase = '' diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index ca5bbd4882c1..7abd83b6dc12 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4"; }; - buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ]; patches = [ ./giflib.patch diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index cfd72601d1eb..db12fc00c87c 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - major = "1.5"; - version = "${major}.0"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; - sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"; + url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; + sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; }; - buildInputs = [ zlib bzip2 lzma perl ]; + nativeBuildInputs = [ perl ]; + + buildInputs = [ htslib zlib bzip2 lzma curl ]; makeFlags = [ "HSTDIR=${htslib}" @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { "CC=cc" ]; + preCheck = '' + patchShebangs misc/ + patchShebangs test/ + sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl + ''; + + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index f8391a2d6b3c..640f32671bbd 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, zlib, htslib, ncurses ? null }: +{ stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - major = "1.5"; - version = "${major}.0"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; - sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5"; + url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; + sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; }; - buildInputs = [ zlib ncurses ]; + nativeBuildInputs = [ perl ]; + + buildInputs = [ zlib ncurses htslib ]; configureFlags = [ "--with-htslib=${htslib}" ] ++ stdenv.lib.optional (ncurses == null) "--without-curses"; + preCheck = '' + patchShebangs test/ + ''; + + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index b98af36604a3..80115f4f0222 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; meta = { homepage = http://gwyddion.net/; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index d4ec974007cf..99b7ef79594f 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; }; - buildInputs = [ autoreconfHook flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ flex bison gperf libxml2 perl gd perlPackages.XMLLibXML ]; configureFlags = [ "--enable-maintainer-mode" ]; meta = { diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 2d6b12a5bb02..8f81a03044be 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,37 +1,20 @@ -{stdenv, fetchgit, qt4, cmake, libxml2, libxslt}: - -let - - srcComponents = fetchgit { - url = git://caneda.git.sourceforge.net/gitroot/caneda/components; - rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a"; - sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59"; - }; - -in +{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: stdenv.mkDerivation rec { - name = "caneda-git-2012-02-16"; - - src = fetchgit { - url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda; - rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1"; - sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8"; + name = "caneda-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Caneda"; + repo = "Caneda"; + rev = version; + sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2"; }; - hardeningDisable = [ "format" ]; - - buildInputs = [ cmake qt4 libxml2 libxslt ]; - - patches = [ - ./gcc6.patch - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools qtsvg qwt ]; - postInstall = '' - mkdir $out/share/caneda/components - cp -R ${srcComponents}/* $out/share/caneda/components - chmod u+w -R $out/share/caneda/components - ''; + enableParallelBuilding = true; meta = { description = "Open source EDA software focused on easy of use and portability"; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index b8406c3255cc..e080569e56fb 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk2 flex gawk perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile gtk2 flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 7cdcbb7fd197..c0821c8a9ab9 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gettext libtool automake autoconf cairo gtk2 ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 657d20553b7f..62d920d929ac 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; }; - buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 gperf bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 65b1537d59b1..dc13f751b89f 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost pkgconfig doxygen ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 1f5109434000..6b792310e8b4 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; - buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 1d61ee2dd162..f4d8d2bea5db 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"; }; - buildInputs = [ pkgconfig cmake glib qt5.full boost libsigrok + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake glib qt5.full boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm ]; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 0e2295479af3..6ca3f80cefd3 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; - buildInputs = [ qt4 cmake graphviz pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 cmake graphviz ]; patches = [ ./drop-hardcoded-prefix.patch diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index f26b13c5e32c..829caacb55cb 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 patches = [ ./gtkdepre.diff ]; diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 34505192021c..1f7ef571eaf9 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation { sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; patches = [ ./configure.patch ]; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 209cba07c438..968ea74e2960 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation { sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 7378aedc1be7..bf1623e28cf7 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -89,7 +89,8 @@ self = stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ]; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index acde7f6ae43b..df7eac02513c 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; }; - buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 293381d2888b..b10ec814ff55 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd"; }; - buildInputs = [ pkgconfig ocaml camlp5 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml camlp5 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 94b1d5907620..b143fd982505 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation (rec { sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; }; - buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index db7e0c0c9382..16ef277e9300 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "TPTP-${version}"; - version = "6.4.0"; + version = "7.0.0"; src = fetchurl { url = [ "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" - "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz" + "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz" ]; - sha256 = "17mnqxnyibmzf5vvbnyhsd010zykqw8ikx4pvyj0x9sfyhpvgfix"; + sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9"; }; buildInputs = [ tcsh yap perl patchelf ]; diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index ca2422558e9a..74f8875fcebe 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; - buildInputs = [ pkgconfig smlnj rsync ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ smlnj rsync ]; buildPhase = '' export SMLNJ_HOME=${smlnj} diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5e2bf8d26241..aac72ba24f01 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { "--with-static-gmp-include-dir=${gmp-static.dev}/include" "--enable-mcsat" ]; - buildInputs = [ gmp-static gperf autoreconfHook libpoly ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gmp-static gperf libpoly ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 1e23cfea27fc..1c86097f2ee4 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -3,6 +3,7 @@ , patchelf , requireFile , alsaLib +, dbus , fontconfig , freetype , gcc @@ -12,6 +13,7 @@ , opencv , openssl , unixODBC +, xkeyboard_config , xorg , zlib , libxml2 @@ -26,7 +28,7 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - version = "11.0.1"; + version = "11.2.0"; name = "mathematica-${version}"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 <FILE>. ''; - sha256 = "1qqwz8gbw74rnnyirpbdanwx3d25s4x0i4zc7bs6kp959x66cdkw"; + sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; }; buildInputs = [ @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { patchelf alsaLib coreutils + dbus fontconfig freetype gcc.cc @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC + xkeyboard_config libxml2 libuuid zlib @@ -100,6 +104,12 @@ stdenv.mkDerivation rec { for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path done + + # Fix xkeyboard config path for Qt + for path in mathematica Mathematica; do + line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') + sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + done ''; preFixup = '' diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index e899548217f7..486a2e69d264 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext ]; doCheck = false; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 1c1cac203f8b..8d0336f58282 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; - buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; meta = { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b220bb8a80ce..ac04321ae0c4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; }; - buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 6cefb156d1df..3edf75a4bffe 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -38,8 +38,12 @@ stdenv.mkDerivation rec { ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ] ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; + buildInputs = [ - #cmake pkgconfig boost protobuf + #cmake boost protobuf freeimage xorg_sys_opengl tbb @@ -69,10 +73,6 @@ stdenv.mkDerivation rec { ++ optional withConstructiveSolidGeometrySupport gts ++ optional withHdf5Support hdf5; - nativeBuildInputs = [ cmake pkgconfig ]; - - propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; - meta = with stdenv.lib; { homepage = http://gazebosim.org/; description = "Multi-robot simulator for outdoor environments"; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index d8597913c24b..06cfc90e65f1 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl gperf bison groff libXft pkgconfig + perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 518db7708b7f..3c7d0a86be04 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit + openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit ]; postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index e5e676059706..98cce6178335 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl makeWrapper ]; + patchPhase = '' + substituteInPlace commands.cpp \ + --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' + ''; + installPhase = '' make install PREFIX=$out wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fcf35a9ca34e..51f523305d18 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -145,6 +145,22 @@ stdenv.mkDerivation { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend + + # wrap perl commands + gitperllib=$out/lib/perl5/site_perl + for i in ${builtins.toString perlLibs}; do + gitperllib=$gitperllib:$i/lib/perl5/site_perl + done + wrapProgram $out/libexec/git-core/git-cvsimport \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-add--interactive \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-archimport \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-instaweb \ + --set GITPERLLIB "$gitperllib" + wrapProgram $out/libexec/git-core/git-cvsexportcommit \ + --set GITPERLLIB "$gitperllib" '' + (if svnSupport then diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f5e5fddd3b72..bed0ef358271 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.2.2"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "1zbj4pfcnj1d0zfhx5jw9x7f2hz99mry20bgyyvrij2vj8gf5vk4"; + sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 49243a823ede..1522f348ca1a 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,18 +7,21 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.19"; + version = "0.11.29"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd"; + sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; }; - patchPhase = '' + patches = [ ./static-root-path.patch ]; + + postPatch = '' patchShebangs . - ''; + substituteInPlace pkg/setting/setting.go --subst-var data + ''; nativeBuildInputs = [ makeWrapper ]; @@ -33,10 +36,7 @@ buildGoPackage rec { cp -R $src/{public,templates} $data wrapProgram $bin/bin/gogs \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ - --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ - --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ - --run "ln -fs $data/{public,templates} ." + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; goPackagePath = "github.com/gogits/gogs"; diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/pkgs/applications/version-management/gogs/static-root-path.patch new file mode 100644 index 000000000000..9eaa72a0c85d --- /dev/null +++ b/pkgs/applications/version-management/gogs/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go +index f206592d..796da6ef 100644 +--- a/pkg/setting/setting.go ++++ b/pkg/setting/setting.go +@@ -474,7 +474,7 @@ func NewContext() { + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) ++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + EnableGzip = sec.Key("ENABLE_GZIP").MustBool() + diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 03997047d3a9..d0bea6d426d5 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa + glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost glm freetype ]; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 8f8750b98c22..bfaa62ebb66d 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { branch = "net.venge.monotone.guitone"; }; - buildInputs = [ qt4 qmake4Hook pkgconfig graphviz ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 7b8b0598925e..c2006e9dd6bf 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; name = "monotone-viz-${version}"; - buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 32cc283bc3c9..73acc3a6b36f 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc + xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp ]; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 6be36533ce6b..8f8930424a94 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { patches = [ ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; postInstall = '' diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix index 82643f18a554..53757c37ed82 100644 --- a/pkgs/applications/version-management/redmine/bootstrap.nix +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -13,8 +13,10 @@ in stdenv.mkDerivation rec { url = "http://www.redmine.org/releases/${name}.tar.gz"; sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - ruby bundler libiconv libxslt libxml2 pkgconfig + ruby bundler libiconv libxslt libxml2 libffi imagemagickBig postgresql which stdenv ]; installPhase = '' diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0a5a3fbd0c64..e069c39f059f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,8 +104,8 @@ let in { subversion18 = common { - version = "1.8.18"; - sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5"; + version = "1.8.19"; + sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"; }; subversion19 = common { diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index ca9620a0eb0e..b00aae61d36d 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 xorg.xwininfo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 60c31cf07f92..10a8f4019fca 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = https://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index e2980c7108f4..ba72e085bf7c 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 dbus dbus_glib GConf]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 59b9893ded14..f0d7fa353707 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchurl -, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig -, kdelibs4, cairo, dbus_glib, mplayer +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, makeWrapper, + qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons, + phonon, cairo, mplayer }: -stdenv.mkDerivation { - name = "kmplayer-0.11.3d"; +mkDerivation rec { + majorMinorVersion = "0.12"; + patchVersion = "0b"; + version = "${majorMinorVersion}.${patchVersion}"; + name = "kmplayer-${version}"; src = fetchurl { - #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; - url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; - sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; + url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; + sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"; }; - buildInputs = [ kdelibs4 cairo dbus_glib ]; + patches = [ + ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA" + ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) + ]; - nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; + + buildInputs = [ + qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons + phonon cairo + ]; postInstall = '' wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin ''; - meta = { + meta = with lib; { description = "MPlayer front-end for KDE"; - license = "GPL"; - homepage = http://kmplayer.kde.org; - broken = true; # Also unavailable on this mirror - maintainers = [ stdenv.lib.maintainers.sander ]; + license = with licenses; [ gpl2 lgpl2 fdl12 ]; + homepage = https://kmplayer.kde.org/; + maintainers = with maintainers; [ sander zraexy ]; }; } diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch new file mode 100644 index 000000000000..9b6652b0be58 --- /dev/null +++ b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch @@ -0,0 +1,11 @@ +--- a/src/kmplayer_part.h ++++ b/src/kmplayer_part.h +@@ -36,7 +36,7 @@ + + class KMPlayerFactory : public KPluginFactory { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") ++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + public: + KMPlayerFactory(); diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch new file mode 100644 index 000000000000..c93453f908c9 --- /dev/null +++ b/pkgs/applications/video/kmplayer/no-docs.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,9 +79,6 @@ + + add_subdirectory(src) + add_subdirectory(icons) +-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) +- add_subdirectory(doc) +-endif(KF5DocTools_VERSION) + add_subdirectory(data) + + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index fef2c1357747..717853af745c 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6"; }; - buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ]; patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1559535f342b..d4cf4b6c4200 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; }; - buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [openssl qt4 mesa zlib libav]; libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] + ":" + stdenv.cc.cc + "/lib64"; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 550cd2930cd2..518cd3d94bac 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -20,14 +20,14 @@ let nativeBuildInputs = [ cmake ]; buildInputs = [ libpng flex bison ]; }; - buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }: + buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }: stdenv.mkDerivation { name = "openfx-${pluginName}-${version}"; src = fetchurl { url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz"; inherit sha256; }; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; preConfigure = '' makeFlagsArray+=("CONFIG=release") makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron") @@ -50,8 +50,9 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip + pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick ]; preConfigure = '' @@ -65,8 +66,9 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu seexpr ]; }) @@ -91,12 +93,12 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; + nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; + buildInputs = [ - pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken + qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken ]; - nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ]; - preConfigure = '' export MAKEFLAGS=-j$NIX_BUILD_CORES cp ${./config.pri} config.pri diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 1244421210e5..d9eef7f4cd85 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "p2pvc"; - buildInputs = [ pkgconfig opencv ncurses portaudio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ opencv ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c2c64bfa4966..c4d80344080d 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -18,7 +18,8 @@ let url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; }; - buildInputs = [ which meson ninja pkgconfig gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which meson ninja gobjectIntrospection ] ++ (with gst; [ gstreamer gst-plugins-base ]); }; diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 26e0d9479541..8b2a69acfcc8 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index cdc53367d114..6f4e60913390 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 29bb439dcf66..3f99258737c2 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" ''; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 571f46de3854..447518d008b4 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa libpulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b806ff65ddb2..b465379c50ed 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -11,6 +11,7 @@ , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false +, fetchpatch }: with stdenv.lib; @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-9300.patch"; + url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899"; + sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn"; + }) + ]; + # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix index bba4cdb6e363..583d978a5514 100644 --- a/pkgs/applications/video/vlc/plugin.nix +++ b/pkgs/applications/video/vlc/plugin.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { preConfigure = "sh autogen.sh"; - buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb xlibsWrapper gtk ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index c8414bbb83a0..663f89b325a2 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { }; patches = [ ./xlib.patch ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk2 scrollkeeper + perl perlXMLParser gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 270a9be6eec9..49920e28f766 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -72,8 +72,9 @@ rec { # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper removeReferencesTo pkgconfig go-md2man go + makeWrapper removeReferencesTo go-md2man go sqlite devicemapper btrfs-progs systemd libtool libseccomp ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index a23537847a19..452f082e20e7 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,15 +4,15 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1235.0.0"; - coreosImageSystemdVersion = "231"; + coreosImageRelease = "1478.0.0"; + coreosImageSystemdVersion = "233"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" ]; stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.28.1"; + version = "1.29.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; + sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq"; + sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index f1d850cd62cd..4fdb7421c3cb 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = ["fortify"]; - buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e318a0b64d7b..ddd8cf72b93d 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 5608f4ed3599..74da6c4ab167 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - buildInputs = [ pkgconfig alsaLib spice_protocol glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib spice_protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 434853b7cc12..9efcc45be359 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -53,8 +53,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig which + cmake which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 962942905db0..20deb2c24048 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; }; - buildInputs = [ pkgconfig libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; # A strange type of bug: dbus is not immediately found by pkgconfig preConfigure = '' diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index b2aa4de40c02..0b611906a466 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; }; - buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index b3e970e90be0..7bc76d5c2bfb 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "dzen2-0.9.5"; - buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 7587dcb490ae..0b9c286aa9de 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig cairo fontconfig freetype + cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl ] ++ stdenv.lib.optional gestures libstroke; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 3bf089f83545..b2e34a016adc 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { --replace "/zsh/functions/Completion/X" "/zsh/site-functions" ''; - buildInputs = [ pkgconfig glib libX11 libXext libXinerama ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libX11 libXext libXinerama ]; meta = { description = "A manual tiling window manager for X"; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index a979797d0801..20df6566b23f 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; makeFlags = "all"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index bd79f6b8ff0a..19c9f8c98351 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq"; }; - buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ confuse yajl alsaLib libpulseaudio libnl ]; makeFlags = [ "all" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 83c4e6828e1d..fbea1d4e9a41 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1621"; + version = "1651"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm"; + sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 9bbb8f161328..1c6b8a84c952 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809"; }; - buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ xorg.libX11 dbus_glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index dc624f449865..17084d6a6a70 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "matchbox-${version}"; version = "1.2"; - buildInputs = [ libmatchbox pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmatchbox ]; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 72947906d6f0..ebe58e921ddd 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation { substituteInPlace man/Makefile --replace "nroff -man -Tlatin1" "${mandoc}/bin/mandoc -T man" ''; - buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc pkgconfig which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 7b60d573d1e5..ead78bf4efd9 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -6,8 +6,9 @@ stdenv.mkDerivation rec { name = "openbox-${version}"; version = "3.6.1"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libxml2 + libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification makeWrapper python2.pkgs.wrapPython diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 226b33be0603..d2bf1e5a96de 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { name = "oroborus-${version}"; version = "2.0.20"; - buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 60753e468408..bdf914fbd751 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; }; - buildInputs = [ pkgconfig libpng libjpeg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libjpeg libXext libXft libXpm libXrandr libXinerama ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 4b9da41b028c..8f4d4858ca11 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -29,7 +29,8 @@ python27Packages.buildPythonApplication rec { substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out} ''; - buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxcb cairo pango python27Packages.xcffib ]; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 37596f5f212b..d18ffb507956 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; }; - buildInputs = [ pkgconfig which autoreconfHook + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ which rep-gtk pango gdk_pixbuf imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM makeWrapper ]; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 41a50668f19b..cca9f1c6ac58 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms +, xcbutilwm +}: stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.6"; + version = "0.5.8"; - src = fetchurl { - url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz"; - sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj"; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "sxhkd"; + rev = version; + sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - makeFlags = ''PREFIX=$(out)''; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Simple X hotkey daemon"; - homepage = https://github.com/baskerville/sxhkd/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/baskerville/sxhkd"; + license = licenses.bsd2; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 79c73d80789f..020a7bbb3577 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "trayer-1.1.7"; - buildInputs = [ pkgconfig gdk_pixbuf gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdk_pixbuf gtk2 ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index b5d4733bae54..8ed144a32ea4 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/include ''; - buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 39865c4b3e7d..caf97c6510de 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d"; }; - buildInputs = [ pkgconfig libX11 libXext libXft ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXft ]; postPatch = '' diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix index 0102fb05d8ee..e708682e3036 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext alsaLib ]; postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix index 40e41407f7bf..e2f17d11f64d 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext ]; postUnpack = "sourceRoot=\${sourceRoot}/Src"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index cf9a19c12d23..3e8b3f7f1584 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext ]; postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 80a24635f67c..e5eb2fc559da 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; - buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; meta = { description = "Systemtray for Windowmaker"; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index bea7c99a5112..88c312bd265d 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { EOF ''; - buildInputs = [ unzip pkgconfig libixp_hg txt2tags dash python which + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 0ff3367e3aee..598bd23c1642 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "wtftw-0.0pre20161001"; + name = "wtftw-0.0pre20170921"; src = fetchFromGitHub { owner = "kintaro"; repo = "wtftw"; - rev = "b72a1bd24430a614d953d6ecf61732805277cc0c"; - sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp"; + rev = "13712d4c051938520b90b6639d4ff813f6fe5f48"; + sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; - buildInputs = [ libXinerama libX11 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXinerama libX11 ]; libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; preInstall = '' @@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec { cp -p target/release/wtftw $out/bin/ echo "[Desktop Entry] Name=wtftw - Exec=/bin/wtftw + Exec=$out/bin/wtftw Type=XSession DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop ''; diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 2b1b34429c57..f36c69e43392 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -19,8 +19,8 @@ attrsOrig @ attrs = { name = "${baseName}-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono dotnetbuildhelpers makeWrapper diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 5837d413abc9..30a42fcc0fed 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation (args // { inherit src; - buildInputs = [ php autoreconfHook ] ++ buildInputs; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 34358e04194a..b0e39e455ffc 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -16,14 +16,14 @@ do hardeningDisableMap[$flag]=1 done -if [[ -n "${NIX_DEBUG:-}" ]]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then printf 'HARDENING: disabled flags:' >&2 (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 echo >&2 fi if [[ -z "${hardeningDisableMap[all]:-}" ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi for flag in "${hardeningFlags[@]}" @@ -31,40 +31,40 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then case $flag in fortify) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') ;; stackprotector) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi hardeningCFlags+=('-fPIE') if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningCFlags+=('-pie') hardeningLDFlags+=('-pie') fi ;; pic) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi hardeningCFlags+=('-fPIC') ;; strictoverflow) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi hardeningCFlags+=('-fno-strict-overflow') ;; format) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; relro) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi hardeningLDFlags+=('-z' 'relro') ;; bindnow) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; *) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index aacaf196f313..f1f56cf5cec4 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # That @-vars are substituted separately from bash evaluation makes @@ -57,10 +61,6 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 - elif [ "$p" = -m32 ]; then - if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" - fi fi n+=1 done @@ -161,7 +161,7 @@ if [ "$*" = -v ]; then fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then # Old bash workaround, see ld-wrapper for explanation. echo "extra flags before to @prog@:" >&2 printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 866be9cded9e..489fb02dcb5d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -5,15 +5,15 @@ # script that sets up the right environment variables so that the # compiler and the linker just "work". -{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell +{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , useMacosReexportHack ? false }: -with stdenv.lib; +with stdenvNoCC.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> @@ -25,6 +25,7 @@ assert (noLibc || nativeLibc) == (libc == null); assert cc.langVhdl or false -> zlib != null; let + stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; # Prefix for binaries. Customarily ends with a dash separator. diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index f0c922a3d5b4..b15f1e461e5f 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. @@ -109,7 +113,7 @@ fi #fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "extra flags before to @prog@:" >&2 printf " %q\n" "${extraBefore[@]}" >&2 echo "original flags to @prog@:" >&2 diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index 2de748b5f31e..88e644dc54dc 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. @@ -24,7 +28,7 @@ extraBefore=() #export NIX_@infixSalt@_LDFLAGS_SET=1 # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "extra flags before to @prog@:" >&2 printf " %q\n" "${extraBefore[@]}" >&2 echo "original flags to @prog@:" >&2 diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 72c999ff8bc8..5d81e34a047f 100755 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + declare -a args=("$@") # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index a9cc1e3f9e6f..bbab3c43d6f8 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # phase separation makes this look useless @@ -63,12 +67,22 @@ fi extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) +# Three tasks: +# +# 1. Find all -L... switches for rpath +# +# 2. Find relocatable flag for build id. +# +# 3. Choose 32-bit dynamic linker if needed declare -a libDirs declare -A libs -relocatable= +declare -i relocatable=0 link32=0 -# Find all -L... switches for rpath, and relocatable flags for build id. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then +if + [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \ + || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \ + || [ -e @out@/nix-support/dynamic-linker-m32 ] +then prev= # Old bash thinks empty arrays are undefined, ugh. for p in \ @@ -83,6 +97,13 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I -l) libs["lib${p}.so"]=1 ;; + -m) + # Presumably only the last `-m` flag has any effect. + case "$p" in + elf_i386) link32=1;; + *) link32=0;; + esac + ;; -dynamic-linker | -plugin) # Ignore this argument, or it will match *.so and be added to rpath. ;; @@ -108,6 +129,14 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I done fi +if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then + # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's + # use it. + extraAfter+=( + '-dynamic-linker' + "$(< @out@/nix-support/dynamic-linker-m32)" + ) +fi # Add all used dynamic libraries to the rpath. if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then @@ -150,13 +179,13 @@ fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? -if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then extraAfter+=(--build-id) fi # Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then # Old bash workaround, see above. echo "extra flags before to @prog@:" >&2 printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index c84a094e26b0..c43c2e12d74a 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,5 +1,5 @@ skip () { - if [ -n "${NIX_DEBUG:-}" ]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "skipping impure path $1" >&2 fi } diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a9bfac320fb8..e3159d205301 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -27,4 +27,4 @@ fetchurl ({ "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"]) +} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes" "postFetch"]) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 14553c33e039..32214db65842 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -68,7 +68,7 @@ rec { ${text} ''; checkPhase = '' - ${stdenv.shell} -n $out + ${stdenv.shell} -n $out/bin/${name} ''; }; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 6b1ebfd68d0d..8815bf688389 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { ./install.sh ${withFont} ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1f3qvzl7blqddx3cm2sdml7hi8s56yjc0vqhfajndxr5ybz6g1rw"; - meta = with stdenv.lib; { description = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 0a0ff4263ec6..75ea3360919e 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.3.0"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm"; + sha256 = "1gg7znfgyj4zxsa741psc67nyixi27q9ghjklz0337r4cwmcwn1g"; }; dontBuild = true; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 0004302ab976..928c5396b61c 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./rsvg-convert.patch ]; - buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; configureFlags = "--enable-png-creation"; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix new file mode 100644 index 000000000000..8b27f4fbf729 --- /dev/null +++ b/pkgs/data/misc/brise/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, librime }: + +stdenv.mkDerivation rec { + name = "brise-unstable-2017-09-16"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "brise"; + rev = "1cfb0fe1d3a4190ce5d034f141941156dd271e80"; + sha256 = "1l13j3cfwida0ycl874fizz2jwjvlxid589a1iciqa9y25k21ql7"; + }; + + buildInputs = [ librime ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + # we need to use fetchFromGitHub to fetch sub-packages before we 'make', + # since nix won't allow networking during 'make' + preBuild = import ./fetchPackages.nix fetchFromGitHub; + + makeFlags = [ "BRISE_BUILD_BINARIES=yes" "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Rime Schema Repository"; + longDescription = '' + This software is a collection of data packages used by Rime + to support various Chinese input methods, including those based on + modern dialects or historical diasystems of the Chinese language. + ''; + homepage = http://rime.im; + # Note that individual packages in this collection + # may be released under different licenses + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.sifmelcara ]; + }; +} diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/data/misc/brise/fetchPackages.nix new file mode 100644 index 000000000000..92930c67cc90 --- /dev/null +++ b/pkgs/data/misc/brise/fetchPackages.nix @@ -0,0 +1,130 @@ +fetchFromGitHub: +# generated using https://gist.github.com/sifmelcara/895c71f99500b9d56d68e9a866b58821 +'' +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-array"; + rev = "9ca2b725ae52c9b3185213e3555df1f9d4f1c53f"; + sha256 = "0x3sifdpdivr8ssynjhc4g1zfl6h9hm9nh9p9zb9wkh1ky9z7kha"; +}} array +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-bopomofo"; + rev = "7046ffe42b46915947117f80d901fb9a6e19c1a7"; + sha256 = "09w8jl2dlgp72k49x0l2jiaqb359v576kai4xww6cljgr24ng8pl"; +}} bopomofo +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cangjie"; + rev = "64242be99c1e6793c9f40fef296a81d07a84e976"; + sha256 = "0v5sk8zrm5p5gg8lszqm0imj9jswjlnfq87nw6m9pg5h5al230ja"; +}} cangjie +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-combo-pinyin"; + rev = "97a7dc4670e0f90ad28e7d67c1543f4f0adc531d"; + sha256 = "0y8iyvq7z6xj3lk2ppk4ggz297wn1r2xxbv53f2710jc7gyzf04q"; +}} combo-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-double-pinyin"; + rev = "1b75af4239897fd1e4c99d625b62093e66baff14"; + sha256 = "0p54qx5a6rr55hl997kdcfxjczd9lcddrc5xsy7nhlfyc6108s2v"; +}} double-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-emoji"; + rev = "7e527056fe055237fee59463e0d445f3909aaf0c"; + sha256 = "04d35n254viw29yyjf3ml7xljmi63sqgg870swlbi5bikcx7n9jf"; +}} emoji +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-essay"; + rev = "595e35756d16d57d09405e243302b65b4384b5b4"; + sha256 = "10kqhvrz8x17b2pf6x2x2znz5y6cj05c4rgwi1f0xhxiyrgjw9gm"; +}} essay +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-ipa"; + rev = "9e02f8a02e9febb7b2df25f6906881a1df934811"; + sha256 = "1g4v4j1gnv1qspfz88liwj1aa4gaa3aax0x2cif4vxicsm7w372m"; +}} ipa +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-jyutping"; + rev = "3cc76e6e15cc05f1f94b89e750c21f87ce8fc0e4"; + sha256 = "1yggz0yb84z8810s2gmsxkm9lh57fdzddx5v2rb5mqcwnimsd6ap"; +}} jyutping +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-luna-pinyin"; + rev = "da00c3a6f932f094666e98a09f6ce9c7d74c334c"; + sha256 = "0q3g1hj9bay5865h3pz7gv46d7wfka1jdxnddxcbp4zn7gjpsd48"; +}} luna-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-middle-chinese"; + rev = "6f9731bac8f289f77d35f1090159f1937e38c1f7"; + sha256 = "0xd9iwk4j5043gfmp7rb57hbarfm6sxr32wiasi6p3c5g355zn89"; +}} middle-chinese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-pinyin-simp"; + rev = "38c08403c22845f7e2965c1d7a1514b41755d7dc"; + sha256 = "1c0cqljx3d93w27y2flxyqcfd3rd9fvixbw6mxgfjzdb3s42bn8h"; +}} pinyin-simp +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-prelude"; + rev = "120c2aa73b1b5e1bce904901bf13f506295004a5"; + sha256 = "1aah9z58gkqrc18zadsq598ybj8ra22bgka3gma2jmi3rls2znq4"; +}} prelude +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-quick"; + rev = "638abf270e121bc2bfc6029a14ee85a3f4c2188b"; + sha256 = "0l1pma0yxrypnb5cq7jiczy0wa42kdqsc1brqkkccdnp08pa1p1m"; +}} quick +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-scj"; + rev = "6b74ce14be0464bf076d7adc40aea4b120f233ec"; + sha256 = "0lr92knr41mlqd1s0g2lh2h2qr8xka1s46x7iv4d6ghjf0id4gz6"; +}} scj +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-soutzoe"; + rev = "3ab93d1b9ca9ca7cf17ff32bb4418b7a095afc3c"; + sha256 = "1glbvgzx4psasq23511k8ymd7mf1pqvm3z18nzszhs00iif66s3m"; +}} soutzoe +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stenotype"; + rev = "766f22565f83f5c63c0ea195c936779ec6ae824d"; + sha256 = "0jsvfq7xim99zs5imyk7rpknlaimk6nlxy38fmfxa1r843781mfd"; +}} stenotype +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stroke"; + rev = "e048967a4c1b956575828f1a20e565efed4b1137"; + sha256 = "10asdz5bj12pnji7afzls6jd9dn2v90l2dgdjf0jfp2kfzd6pxnl"; +}} stroke +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-terra-pinyin"; + rev = "e303507e728def38739f5761c50722eae1f06dd5"; + sha256 = "1krbmx2iq3zw4q1x4aa9c72b9xgrnjrhyxa4h5hnq5l29p9qms4d"; +}} terra-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wubi"; + rev = "97b7d9f93378e98fd11167bd80d54c40e67076aa"; + sha256 = "1cdpbqqkqjbizja0w3f7a826a5bxb39nlf9qf2130x9havmkc89z"; +}} wubi +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wugniu"; + rev = "de40b29f8218cc852bf82b315c7070f1d50bda02"; + sha256 = "1m7miwsqpy49cgqd1bl7z5lkkirj3lc2bdwd1zqfg5zbgfwn0rp8"; +}} wugniu +'' diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 484aa4e5a232..64b0fd0c38a4 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,24 +1,25 @@ {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool , libxml2, glib}: -let version = "1.8"; in +let version = "1.9"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a"; + sha256 = "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw"; }; nativeBuildInputs = [ pkgconfig gettext intltool perl perlXMLParser libxml2 glib ]; - meta = { + meta = with stdenv.lib; { inherit version; description = "A database of common MIME types"; homepage = http://freedesktop.org/wiki/Software/shared-mime-info; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.mimadrid ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index c140eb944c6c..8cf18b7018da 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; }; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; propagatedBuildInputs = [ gtkmm libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index ff4abf26ac83..c07dc9730e6d 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw"; }; - buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon libSM diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 9f41a589220b..63df026836fa 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python libxml2Python libxslt which libX11 gtk intltool GConf gnome_doc_utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix index e114f72a21b8..0dcb409e0aae 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d"; }; - buildInputs = [ pkgconfig python glib intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib intltool ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 7c9cd42a0e97..bd8b71d0daca 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig atk cairo glib gtk + atk cairo glib gtk pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index ab01796197c2..f0882e39a857 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx"; }; - buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 7a1b4d1f5318..4b1daa3af90b 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; }; configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 75db62554360..22604f214d48 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; }; - buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix index 77a2b710f447..d2bcaa7c5e10 100644 --- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; } diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 8cd8635c85c5..62a224eb504a 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . "; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt gettext]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index dc8181414ce1..e5d2489436ee 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { ./vte-0.28.2-limit-arguments.patch ]; - buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk ncurses ] ++ stdenv.lib.optionals pythonSupport [python pygtk]; configureFlags = '' diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index 6be2a440879f..b0b669148ff3 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix index 0f811471fb0c..029d751e7190 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2; sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; }; - buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool gnome_vfs libbonobo ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 48523f512b3f..06af8a63200a 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ pkgconfig libxml2 bzip2 openssl dbus_glib fam cdparanoia - intltool gnome_mime_data avahi acl + [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + gnome_mime_data avahi acl ]; propagatedBuildInputs = [ GConf glib ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 4525246c20ed..49b8cc88f9de 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; - buildInputs = [pkgconfig intltool enchant isocodes ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 49161c1a7455..8927bd120f61 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html patches = [ ./01_remove-disable-deprecated.patch ]; - buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index a20c419fe0fb..5003215529e4 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig gtk python gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index 4d0f3061c450..9d22488c25da 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; - buildInputs = [ pkgconfig libgnomecanvas gtkmm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgnomecanvas gtkmm ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 7eef5af0adcb..2365e166d5ee 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./glib.patch ./cups_1.6.patch ]; - buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libart_lgpl ]; propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 390059089fc0..6945ad1f04b9 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./bug653388.patch ]; - buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index a19b20e86b5c..a8072aa37525 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation { sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; - buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; } diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index be288b809d43..b9db3422723e 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; - buildInputs = [ pkgconfig gtk gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk gettext ]; propagatedBuildInputs = [ libxml2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 7a5ab769cc96..545e89a85125 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) src name; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 00895f9a2bb2..9aae9215650f 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool itstool libxml2 clutter_gtk libuuid webkitgtk gnome3.tracker gnome3.gnome_online_accounts zeitgeist desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index b5f70d84e520..a10864c347ef 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop gst_all_1.gst-plugins-bad clutter_gtk clutter-gst diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index a0f8d9669556..da49c36cd069 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 python gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index fbd5d748f5eb..618d6152d81f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server + gtk3 wrapGAppsHook intltool evolution_data_server sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 0c7adcb03192..15f1f58b558c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + gtk3 wrapGAppsHook intltool gjs gdk_pixbuf librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index e39614e765d6..68cd2a42fa64 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.geocode_glib geoclue2 diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 4840d200cf99..d34334c4f64c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-getting-started" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxslt docbook_xsl desktop_file_utils inkscape poppler_utils gnome3.gsettings_desktop_schemas makeWrapper gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 2fc27617d98e..91d5f7d00e49 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -6,8 +6,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-tests" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 5af407ef15cd..bb8375d595ef 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gobjectIntrospection wrapGAppsHook gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg libgweather autoreconfHook diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 4f11e7a28438..54e79872c679 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify python3Packages.pycairo python3Packages.dbus-python python3Packages.requests diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 4c152777f2cb..dcee87dc799c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 + gtk3 wrapGAppsHook libgtop intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 6e8394950a6a..61ec2ac446ce 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 3b5542544d50..d6804e09a482 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook gjs intltool itstool + gtk3 wrapGAppsHook gjs intltool itstool libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 093900dcb7ab..7d71d1b7adc9 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; }; - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection intltool makeWrapper ]; meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index fc97d1b6d6e6..7c3da70edeb2 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 58d5a5b8cdc5..03dbdb1842a4 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme libsecret avahi libsoup p11_kit vala_0_32 diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 8b8b6248642c..e719fbf9f219 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret itstool makeWrapper gnome3.defaultIconTheme librsvg ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 15db270e80c5..f94cb3c57c46 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2 wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9200c4180bd2..402c6c1c355e 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 intltool docbook_xsl docbook_xsl_ns makeWrapper ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 9a29d11f1aea..ea257ed69f0f 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { gnome_online_accounts shared_mime_info ]; propagatedBuildInputs = [ folks telepathy_logger evolution_data_server telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file makeWrapper telepathy_glib clutter_gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index ec8cf1188156..35aae8cc9eb9 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 0798d69f9e65..e970dba5615e 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -7,12 +7,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = let + gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome + in [ + intltool gpg gobjectIntrospection libxslt + libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 ]; - propagatedBuildInputs = [ p11_kit ]; + propagatedBuildInputs = [ glib gtk p11_kit ]; #doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 59f0381f2e87..09e27e7c0c5f 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { "--with-plymouth=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib itstool libxml2 intltool accountsservice gnome3.dconf systemd gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 10d9c46123dd..482d6ae64a40 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ]; propagatedBuildInputs = [ spidermonkey_38 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 7fae0b5c67f4..f237d745c1cc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme makeWrapper gnome3.gsettings_desktop_schemas itstool libnotify libcanberra_gtk3 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 66cc2cb24c73..e69092a57123 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { touch src/*.vala ''; - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool evolution_data_server gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index b116c2902da3..a6cc7ec962a0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation rec { preFixup = with gnome3; '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + # Thumbnailers (for setting user profile pictures) + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" ) for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 7265f09731fd..d56018bf1e8b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland gtk3 glib intltool gnome_doc_utils libxkbfile gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index c94c178558da..77c4805a197e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 file gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index aef58567387b..f9380272f065 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libxslt libtool libsecret libpwquality cracklib libnotify libdvdread libcanberra_gtk3 docbook_xsl gdk_pixbuf gnome3.defaultIconTheme diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 16d7151ea096..14aeb69e14cb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix index ee8c3a902d59..fdd23d134599 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gobjectIntrospection ]; meta = { homepage = http://www.gnome.org; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 29f6ae3e860e..1f64e10aa25d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , telepathy_glib, intltool, dbus_libs, icu, glib_networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3 @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook - libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook + libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 90fc3a8737ae..cb50494bb404 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 34f8cee625aa..1f933e1b3c57 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas wrapGAppsHook ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 83305f440b14..fd90b8867d7b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib libgtop intltool itstool makeWrapper file ]; configureFlags = [ "--enable-extensions=all" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index aa6f48ac420b..d66efca66d9c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 3164e4dd74b1..c32d9d95d88f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bash gtk3 glib intltool itstool libxml2 gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix index 5cc3385ad841..3db252d063f2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 4f02673e036f..6ab72ab7826d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; meta = with stdenv.lib; { homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 587165e107b0..0b83f6eb2267 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 systemd ]; diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 4b8fc90adad8..b6d9ccef6667 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts gnome3.totem-pl-parser gnome3.rest gmime json_glib avahi gnome3.libmediaart tracker intltool itstool ]; diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index b4a794812a5c..18a4da4efe2d 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool glib libxml2 libsoup gnome3.totem-pl-parser ]; propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix index 95785d9ed4d2..8e72b7fb233e 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/core/gsound/default.nix @@ -10,7 +10,8 @@ in stdenv.mkDerivation rec { sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; }; - buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 3dfbe6fbf0b5..a39464449485 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; - buildInputs = [ pkgconfig atk cairo glib pango + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ atk cairo glib pango libxml2Python perl intltool gettext ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index 43e27cdb4814..7763867bcbff 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibmm gtkmm gtksourceview ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index d4697c99a938..4d59a3f20133 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./fix_introspection_paths.patch ]; - buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ]; meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index 47cb96de6c34..56159500228a 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup libxml2 libarchive ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 2bcbefc8dbf9..74636708988b 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ]; preFixup = '' wrapProgram $out/bin/gkbd-keyboard-display \ diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index b39e1f6fa56c..5c1ffb450396 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 9f1f30965330..8fddd8f7d5a6 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-python3" ]; - buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; meta = with stdenv.lib; { description = "A GObject-based plugins engine"; diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index 5a8117528b68..c5c75c166f73 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index d508f1483598..f987df460349 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib -, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }: +, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { # fatal error: gio/gunixinputstream.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + ) + ''; + # hardeningDisable = [ "format" ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index d467cad93b4e..154e7221cc20 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; }; - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsoup gobjectIntrospection]; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 0c800ce98593..0b453d5c5332 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,14 +3,7 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; - version = "${major_version}.0.1"; - major_version = "3.22"; - - src = fetchurl { - url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz"; - sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5"; - }; + inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix new file mode 100644 index 000000000000..cea148891a72 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "simple-scan-3.22.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; + sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index fb010756f290..638c0cbe7dcd 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool gobjectIntrospection glib gtk3 clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 63f36004bcd6..794f38013337 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; }; - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file intltool gmime libxml2 libsoup ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index b3e9e5dd1fee..34ec9b58116f 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index a60c38015c08..0d3e8bd358d4 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt gnome3.gsettings_desktop_schemas wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite diff --git a/pkgs/desktops/gnome-3/core/vte/2.90.nix b/pkgs/desktops/gnome-3/core/vte/2.90.nix index 4f56439311ec..7cd72ceee42c 100644 --- a/pkgs/desktops/gnome-3/core/vte/2.90.nix +++ b/pkgs/desktops/gnome-3/core/vte/2.90.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 7eabe6ad9d4d..b3962015d3cc 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ]; propagatedBuildInputs = [ gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index ad0188b0053b..69f61eb7697c 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -20,5 +20,6 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; - nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool gperf ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs or [] + ++ [ gtk_doc autoconf automake gettext libtool gperf ]; }) diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 9111802eb6a8..eaceadcc85c4 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 0a3976f35a15..353b9ccb55e3 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool libxml2 libxslt ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 4ee79bbc3dc5..6b458598c299 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl librsvg gdk_pixbuf gnome3.defaultIconTheme groff gnome3.gsettings_desktop_schemas wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 7be1f79be4c5..fcb36fb8ded2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -30,7 +30,7 @@ let optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-log gnome-system-monitor + gnome-system-log gnome-system-monitor simple-scan gnome_terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs @@ -230,6 +230,8 @@ let rest = callPackage ./core/rest { }; + simple-scan = callPackage ./core/simple-scan { }; + sushi = callPackage ./core/sushi { }; totem = callPackage ./core/totem { }; diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix index a1b38b21869a..c6927111ed48 100644 --- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix +++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; }; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 6a50834f105e..9ff98c2825e6 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index f6e67be8d53a..08dbade67fbf 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix index 156d91b3eae7..f12bbb0ca41d 100644 --- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk3 intltool ]; meta = with stdenv.lib; { description = "Gnome docking library"; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 9e5d256741f6..40e1473b59e2 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-card-theme-formats=svg" ]; - buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 50a7d2906a77..48b2b3823729 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 68228750cd87..486fe5c486e0 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index a96dae3c12cb..bfa345c4a40b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 + gtk3 wrapGAppsHook intltool itstool librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index dc2289daff82..13afae2eb2cb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support + gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 43db32e88577..3d0d5d6df467 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index c55650e705a9..d76e585bb4eb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gtk3 wrapGAppsHook librsvg intltool itstool libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index cf2282188782..90fdccc11860 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 9eafb166eee8..cd13e6ab9585 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -5,8 +5,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index c8ba82c7246d..a0f83d48c3da 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee json_glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 78eaa23e63bd..d456abe6dc1f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra_gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index d6feab93dba1..37218776f123 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index bd6be7d43c58..21d4ed6f520e 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 1b6f08d1fd65..3836548b3ab2 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 8ec54b489721..7bd3ca95de94 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index f319608764d6..514b2a035575 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra_gtk3 itstool intltool clutter libxml2 clutter_gtk wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index a4cad01488d5..c6416960b7aa 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index c2b1f5857124..6f6beee89615 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libxml2 itstool intltool wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index ca0450dc7f94..b33488e34fce 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index e0622b176218..498ced47a089 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index 69d89bd58795..d0801714a0f9 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib libtool m4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libtool m4 ]; propagatedBuildInputs = [ exiv2 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 46fa9bc39e5a..364a52ee5cdf 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome3.gnome_online_accounts ]; propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index 1df3c1ffdb7c..ad415368368d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=/" ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.gsettings_desktop_schemas file gdk_pixbuf gnome3.defaultIconTheme librsvg libnotify gnome3.gnome_shell python2Packages.pygobject3 diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix index c0bd2fed3f2d..dfeefe0def86 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; }; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 44573d1a5bb1..71e3ff19dc3f 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ enchant ]; # required for pkgconfig - buildInputs = [ pkgconfig glib gtk3 isocodes vala ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk3 isocodes vala ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 89703b61932b..3f65ab36b0bb 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix index 98b71c9d9c9f..90ee658fd096 100644 --- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"; }; - buildInputs = [ pkgconfig glib gtk3 libgee intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk3 libgee intltool ]; meta = with stdenv.lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index 0ad6a590eb37..f477c13c7bae 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; meta = with stdenv.lib; { description = "Database access library"; diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 6915ede4ad51..a71dbf5494da 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.gnome_common libtool vala_0_32 libssh2 gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix index 9988541e0f5b..abdcdef99379 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v"; }; - buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 37cdfc730ab8..63f59357db5e 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,41 +1,35 @@ -{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base, - glib, gobjectIntrospection, telepathy_glib +{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, + glib, gobjectIntrospection, libpeas }: stdenv.mkDerivation rec { - version = "0.11.2"; + version = "0.13.3"; name = "gnome-shell-pomodoro-${version}"; src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-pomodoro"; - rev = "${version}"; - sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l"; + owner = "codito"; + repo = "gnome-pomodoro"; + rev = "${version}"; + sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2"; }; - configureScript = ''./autogen.sh''; + configureScript = "./autogen.sh"; + + nativeBuildInputs = [ + autoconf-archive libtool intltool appstream-glib + wrapGAppsHook pkgconfig + ]; buildInputs = [ - which intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer + glib gobjectIntrospection libpeas + dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib + gnome3.gsettings_desktop_schemas + gnome3.gnome_common gnome3.gnome_shell gtk3 gnome3.defaultIconTheme ]; - preBuild = '' - sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - meta = with stdenv.lib; { homepage = https://github.com/codito/gnome-shell-pomodoro; description = "A time management utility for GNOME based on the pomodoro technique"; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 6678b11df023..02f58f81200e 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -16,7 +16,8 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; }; - buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo base gui freetype x11 libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 8624cac09ed7..54b112927690 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; - buildInputs = [ pkgconfig libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix index 9badeb5370e8..b29a50af3654 100644 --- a/pkgs/desktops/xfce/applications/gigolo.nix +++ b/pkgs/desktops/xfce/applications/gigolo.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python gettext intltool gtk gvfs]; meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 1a6b585a22a0..ad1727da3b93 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index a447812f9a78..a0856b6a6d7b 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix index 1063cfca090c..2de4f34fcf6f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ intltool pkgconfig gtk libwnck ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk libwnck ]; meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 1bd257991c97..3c7c425e3790 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 67c92dae5e88..46b9a3720090 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; meta = with stdenv.lib; { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 6e5ac7c55ea1..c4b2366e7870 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 1c473b42d60b..5a411bfbb5be 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ pkgconfig glib intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib intltool ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index a68686219ba9..2996040bbd08 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool + intltool gtk dbus_glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4panel ]; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 9b29835cdc91..6e785c9438bb 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus_glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index de55509aa40d..109c22f1e58c 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; # not needed to build it but to use it propagatedBuildInputs = [ autoconf automake libtool intltool ]; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index edbc11b86057..fbf03cc4a81d 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) - buildInputs = [ pkgconfig intltool glib libxfce4util ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib libxfce4util ]; propagatedBuildInputs = [ dbus_glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index 3438791cd781..0dcdcda69946 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 4e1733704287..6614d746b686 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 7aca910b8a82..fb8b1bae83d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix index 4ca19d734496..0905a9bb16a7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index 3be77ab77caa..b6d0fc12db3b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index fbc841db1fc6..438be7e84944 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { pythonPath = [ dockbarx ]; - buildInputs = [ pkgconfig python2 vala gtk2 pythonPackages.wrapPython ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) ++ pythonPath; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index d7c5f53d2ee7..a5cfc3659f67 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 6e0f98156f09..81bff06500bb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 3e3861b7604c..4f4f882d67b1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 8b6552e4e6c6..c6252a48bff6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index dd80259db5fa..2b43eaca4c03 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk exo gnutls libgcrypt ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 6a2f5bd50849..6f16561d41d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk exo ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index 5822ff173c97..e81289f26f66 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; }; - buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ]; postPatch = '' substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index 710ca70b0212..9650cafedec7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index eba05af69c05..c8c9c7735a9f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 200e3ccb071b..34677db81d12 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 334d6f4943fd..3c0d1a488f88 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index 37ad643930ab..32b2e6514620 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${version}"; - buildInputs = [ pkgconfig intltool python3 imagemagick libwnck gtk2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool python3 imagemagick libwnck gtk2 exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ]; preConfigure = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index 42c54bf46b36..453c09cfc70c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel garcon + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon gtk libxklavier librsvg libwnck ]; meta = { diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index b954cc4980db..8ff4a74e6bf4 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig xfce4_dev_tools thunarx-2-dev exo gtk libxfce4util libxfce4ui diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index e3cdfc13812a..d44281d052d1 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk thunarx-2-dev python2 ]; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 5fa88ab87e9e..d27f498842e3 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -16,8 +16,9 @@ in stdenv.mkDerivation rec { sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared_mime_info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 62a504ef9668..6b817d06553e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,81 +1,71 @@ -{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_4, makeWrapper }: +{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }: stdenv.mkDerivation rec { - version = "0.23.0"; - name = "crystal-${version}-1"; - arch = - { - "x86_64-linux" = "linux-x86_64"; - "i686-linux" = "linux-i686"; - "x86_64-darwin" = "darwin-x86_64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - prebuiltBinary = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; - sha256 = - { - "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; - "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; - "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - }; + name = "crystal-${version}"; + version = "0.23.1"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "05ymwmjkl1b4m888p725kybpiap5ag2vj8l07d59j02inm5r0rcv"; + sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; + }; + + prebuiltName = "crystal-0.23.0-1"; + prebuiltSrc = let arch = { + "x86_64-linux" = "linux-x86_64"; + "i686-linux" = "linux-i686"; + "x86_64-darwin" = "darwin-x86_64"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + in fetchurl { + url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz"; + sha256 = { + "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; + "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; + "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; + }."${stdenv.system}"; }; + srcs = [ src prebuiltSrc ]; + # crystal on Darwin needs libiconv to build - buildInputs = [ - boehmgc libatomic_ops pcre libevent llvm_4 makeWrapper + libs = [ + boehmgc libatomic_ops pcre libevent ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; - libPath = stdenv.lib.makeLibraryPath ([ - boehmgc libatomic_ops pcre libevent - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - libiconv - ]); + nativeBuildInputs = [ makeWrapper ]; - unpackPhase = '' - tar zxf ${src} - tar zxf ${prebuiltBinary} - ''; + buildInputs = libs ++ [ llvm ]; + + libPath = stdenv.lib.makeLibraryPath libs; - sourceRoot = "."; + sourceRoot = "${name}"; fixPrebuiltBinary = if stdenv.isDarwin then '' - wrapProgram $(pwd)/crystal-${version}-1/embedded/bin/crystal \ + wrapProgram ../${prebuiltName}/embedded/bin/crystal \ --suffix DYLD_LIBRARY_PATH : $libPath '' else '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - crystal-${version}-1/embedded/bin/crystal + ../${prebuiltName}/embedded/bin/crystal patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ - crystal-${version}-1/embedded/bin/crystal + ../${prebuiltName}/embedded/bin/crystal ''; - buildPhase = '' - # patch the script which launches the prebuilt compiler - substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \ - "/usr/bin/env bash" "${stdenv.shell}" - substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \ - "/usr/bin/env bash" "${stdenv.shell}" - + preBuild = '' + patchShebangs bin/crystal + patchShebangs ../${prebuiltName}/bin/crystal ${fixPrebuiltBinary} - - cd crystal-${version} - make release=1 PATH="../crystal-${version}-1/bin:$PATH" - make doc + export PATH="$(pwd)/../${prebuiltName}/bin:$PATH" ''; + makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ]; + installPhase = '' install -Dm755 .build/crystal $out/bin/crystal wrapProgram $out/bin/crystal \ --suffix CRYSTAL_PATH : $out/lib/crystal \ --suffix LIBRARY_PATH : $libPath - install -dm755 $out/lib/crystal cp -r src/* $out/lib/crystal/ @@ -93,12 +83,13 @@ stdenv.mkDerivation rec { dontStrip = true; + enableParallelBuilding = true; + meta = { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ mingchuan ]; + maintainers = with stdenv.lib.maintainers; [ sifmelcara david50407 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index fae1c1d1b40d..8bae6e2363f6 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -20,7 +20,8 @@ in stdenv.mkDerivation { sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; }; - buildInputs = [ cmake pkgconfig libffi llvm_35 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libffi llvm_35 ] ++ stdenv.lib.optional doCheck perl; patches = [ ./link-llvm.patch ]; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 85caa82a155c..87572661635b 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { name = "factorimage"; }; - buildInputs = [ git rlwrap curl pkgconfig perl makeWrapper + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext mesa libXmu libXt libICE libSM ]; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 751d44a38a4c..af33039d341a 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; - buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono dotnetbuildhelpers autoconf automake which ]; configurePhase = '' sed -i '988d' src/FSharpSource.targets diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 488aaa228dae..354723dfa740 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake which diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 0887dd992526..3aef4e3ba89d 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,78 +1,30 @@ -{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }: +{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "0.9.4.0"; + version = "0.9.5.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7"; + sha256 = "1pi2ny3kpmvm85x8w98anhjf0hp0wccc51m7v697qypn5cl4ydqk"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries - zarith camlp4 yojson pprint openssl pkgconfig file + z3 ocaml findlib ocaml_batteries menhir stdint + zarith camlp4 yojson pprint ]; - preBuild = '' - substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" \ - --replace Darwin xyz - substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true" + makeFlags = [ "PREFIX=$(out)" ]; - # Fails with bad interpreter otherwise + preBuild = '' patchShebangs src/tools patchShebangs bin - - export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" - # remove hardcoded windows paths - sed -i '/<FSharpTargetsPath/d' src/*/*.fsproj - - mkdir -p src/VS/packages/FsLexYacc.6.1.0 - ln -s ${dotnetPackages.FsLexYacc}/lib/dotnet/FsLexYacc src/VS/packages/FsLexYacc.6.1.0/build - ''; - - makeFlags = [ - "FSYACC=${dotnetPackages.FsLexYacc}/bin/fsyacc" - "FSLEX=${dotnetPackages.FsLexYacc}/bin/fslex" - "NUGET=true" - "PREFIX=$(out)" - ]; - - buildFlags = "-C src"; - - # Now that the .NET fstar.exe is built, use it to build the native OCaml binary - postBuild = '' - patchShebangs bin/fstar.exe - - # Workaround for fsharp/fsharp#419 - cp ${fsharp}/lib/mono/4.5/FSharp.Core.dll bin/ - - # Use the built .NET binary to extract the sources of itself from F* to OCaml - make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \ - $makeFlags "''${makeFlagsArray[@]}" \ - ocaml -C src - - # Build the extracted OCaml sources - make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \ - $makeFlags "''${makeFlagsArray[@]}" \ - -C src/ocaml-output ''; - - # https://github.com/FStarLang/FStar/issues/676 - doCheck = false; - - preCheck = "ulimit -s unlimited"; - - # Basic test suite: - #checkFlags = "VERBOSE=y -C examples"; - - # Complete, but heavyweight test suite: - checkTarget = "regressions"; - checkFlags = "VERBOSE=y -C src"; + buildFlags = "-C src/ocaml-output"; installFlags = "-C src/ocaml-output"; @@ -85,5 +37,6 @@ stdenv.mkDerivation rec { homepage = https://www.fstar-lang.org; license = licenses.asl20; platforms = with platforms; darwin ++ linux; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index b75b57d0f476..21c0a5ede91b 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -25,8 +25,9 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk + libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] ++ stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8a675b1b7761..838032c96984 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c"; + sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 11d28681abcd..a90985c2525a 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9"; + sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3"; }; # perl is used for testing go vet @@ -141,6 +141,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index c1d1ce055d76..25bb008567f7 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -10,7 +10,7 @@ let version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; + url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix new file mode 100644 index 000000000000..fa8502ebd67a --- /dev/null +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -0,0 +1,97 @@ +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; + self = stdenv.mkDerivation { + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"} + mv cfe-${version}* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libedit libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ stdenv.lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + # Maybe with compiler-rt this won't be needed? + ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + + patches = [ ./purity.patch ]; + + postBuild = stdenv.lib.optionalString enableManpages '' + cmake --build . --target docs-clang-man + ''; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + ''; + + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableManpages "man"; + + # Clang expects to find LLVMgold in its own prefix + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test + '' + + stdenv.lib.optionalString enableManpages '' + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + + # Move it and other man pages to 'man' output + moveToOutput "share/man" "$man" + ''; + + enableParallelBuilding = true; + + passthru = { + lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both + isClang = true; + inherit llvm; + } // stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; + }; +in self diff --git a/pkgs/development/compilers/llvm/5/clang/purity.patch b/pkgs/development/compilers/llvm/5/clang/purity.patch new file mode 100644 index 000000000000..b30d0d0b5d5b --- /dev/null +++ b/pkgs/development/compilers/llvm/5/clang/purity.patch @@ -0,0 +1,30 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!Args.hasArg(options::OPT_static)) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared)) { +- const std::string Loader = +- D.DyldPrefix + ToolChain.getDynamicLinker(Args); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Loader)); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch new file mode 100644 index 000000000000..8f4c76bca1eb --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt-codesign.patch @@ -0,0 +1,155 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt +index 8bfc15b5c..f23d0f71a 100644 +--- a/test/asan/CMakeLists.txt ++++ b/test/asan/CMakeLists.txt +@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) + endif() + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-asan-iossim-x86_64" and similar. They also require that an extra env +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(ASAN_TEST_IOS "1") +- pythonize_bool(ASAN_TEST_IOS) +- set(ASAN_TEST_DYNAMIC True) +- +- foreach(arch ${DARWIN_iossim_ARCHS}) +- set(ASAN_TEST_IOSSIM "1") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- foreach (arch ${DARWIN_ios_ARCHS}) +- set(ASAN_TEST_IOSSIM "0") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + # Add unit tests. + if(COMPILER_RT_INCLUDE_TESTS) + set(ASAN_TEST_DYNAMIC False) +diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt +index a68908612..cde0accb5 100644 +--- a/test/tsan/CMakeLists.txt ++++ b/test/tsan/CMakeLists.txt +@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) + list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(TSAN_TEST_IOS "1") +- pythonize_bool(TSAN_TEST_IOS) +- +- set(arch "x86_64") +- set(TSAN_TEST_IOSSIM "1") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(arch "arm64") +- set(TSAN_TEST_IOSSIM "0") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + if(COMPILER_RT_INCLUDE_TESTS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in +-- +2.14.1 + diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix new file mode 100644 index 000000000000..1d5cc0e504b7 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -0,0 +1,81 @@ +{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, darwin +}: + +let + callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + + release_version = "5.0.0"; + version = release_version; # differentiating these is important for rc's + + fetch = name: sha256: fetchurl { + url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm"; + clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47"; + + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; + + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; + + self = { + llvm = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; + + llvm-manpages = lowPrio self.llvm.man; + clang-manpages = lowPrio self.clang-unwrapped.man; + + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; + + libcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ self.libcxx self.libcxxabi ]; + }; + + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + lld = callPackage ./lld.nix {}; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ {}; + + libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; + }; + +in self diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix new file mode 100644 index 000000000000..036161f7b889 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + ''; + + prePatch = '' + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + ''; + + preConfigure = '' + # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package + cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + enableParallelBuilding = true; + + linkCxxAbi = stdenv.isLinux; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh new file mode 100644 index 000000000000..9022fced6ecf --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -0,0 +1,3 @@ +linkCxxAbi="@linkCxxAbi@" +export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix new file mode 100644 index 000000000000..5a2a269345d6 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -0,0 +1,47 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix new file mode 100644 index 000000000000..f19a9afc8044 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, python +, version +}: + +stdenv.mkDerivation { + name = "lld-${version}"; + + src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = http://lld.llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix new file mode 100644 index 000000000000..fac23b290bcb --- /dev/null +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python +, version +, darwin +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860"; + + postPatch = '' + # Fix up various paths that assume llvm and clang are installed in the same place + sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + cmake/modules/LLDBStandalone.cmake + ''; + + nativeBuildInputs = [ cmake python which swig ]; + buildInputs = [ ncurses zlib libedit libxml2 llvm ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + + CXXFLAGS = "-fno-rtti"; + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = licenses.ncsa; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/llvm-outputs.patch b/pkgs/development/compilers/llvm/5/llvm-outputs.patch new file mode 100644 index 000000000000..40096fa3497f --- /dev/null +++ b/pkgs/development/compilers/llvm/5/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix new file mode 100644 index 000000000000..946c04a2ab4e --- /dev/null +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -0,0 +1,153 @@ +{ stdenv +, fetch +, fetchpatch +, perl +, groff +, cmake +, python +, libffi +, binutils +, libxml2 +, valgrind +, ncurses +, version +, release_version +, zlib +, compiler-rt_src +, libcxxabi +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, darwin +}: + +let + src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3"; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with stdenv.lib; + concatStringsSep "." (take 2 (splitString "." release_version)); +in stdenv.mkDerivation rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}* llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + outputs = [ "out" ] + ++ stdenv.lib.optional enableSharedLibraries "lib" + ++ stdenv.lib.optional enableManpages "man"; + + nativeBuildInputs = [ perl groff cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libxml2 libffi ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + + propagatedBuildInputs = [ ncurses zlib ]; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + stdenv.lib.optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + + # Revert compiler-rt commit that makes codesign mandatory + patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + ] + ++ stdenv.lib.optional enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + ++ stdenv.lib.optional (!isDarwin) + "-DLLVM_BINUTILS_INCDIR=${stdenv.lib.getDev binutils}/include" + ++ stdenv.lib.optionals (isDarwin) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ]; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/ExecutionEngine/Orc/OrcJITTests + paxmark m unittests/Support/SupportTests + paxmark m bin/lli-child-target + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; + + postInstall = stdenv.lib.optionalString enableManpages '' + moveToOutput "share/man" "$man" + '' + + stdenv.lib.optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib + install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isi686); + + checkTarget = "check-all"; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix new file mode 100644 index 000000000000..9ba42eed2e2e --- /dev/null +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = http://openmp.llvm.org/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8b6c6d94c750..a84c5bbf7605 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "nasm-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88"; }; + nativeBuildInputs = [ perl ]; + + doCheck = true; + + checkPhase = '' + make golden && make test + ''; + meta = with stdenv.lib; { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 9501b5a3a06e..7b9e00b105db 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4 + ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ac4102c9a63c..97977ba3ed3a 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; - buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper libgit2 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 2ee7d2b7e113..85004767e582 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.21"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "13hmavfmxsqp2s89aa6kljpgjm6c2063bgrz0maq1ms1y3052k38"; + sha256 = "0s87ax5hg9hz6b8kc9yrjckgz56s9iv96l2dcq216cbqkykrrm88"; }; patchPhase = '' diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 42b81a21a671..baf48d7a532c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz +, glib, libiconv, libintlOrEmpty, libtool, expat }: let - generic = { major, minor, sha256 }: + generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; @@ -12,9 +12,9 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; @@ -57,5 +57,13 @@ in rec { sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; }; + vala_0_38 = generic { + major = "0.38"; + minor = "1"; + sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; + extraBuildInputs = [ graphviz ]; + }; + vala = vala_0_34; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ed374ea68229..35172dbd15ba 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ]; sourceRoot = "yosys"; - buildInputs = [ pkgconfig tcl readline libffi python3 bison flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ tcl readline libffi python3 bison flex ]; preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index a81b76849bce..6f58c387586a 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,15 +7,15 @@ let param = url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; }; - v2_1_2 = { - version = "2.1.2"; - url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz; - sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an"; + v3_0_1 = { + version = "3.0.1"; + url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; + sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; in { "8.4" = v2_1_1; - "8.5" = v2_1_2; - "8.6" = v2_1_2; + "8.5" = v3_0_1; + "8.6" = v3_0_1; }."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 9dbc3a3f2991..65be1f4e0667 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { inherit (param) rev sha256; }; - buildInputs = [ autoreconfHook coq ] + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]); preInstall = '' diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index c3169970ad24..a8d3f9ad144c 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,23 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }: +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.5" + then { + version = "3.3.0"; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + } else { + version = "3.1.1"; + url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + }; +in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-3.1.1"; + name = "coq${coq.coq-version}-interval-${param.version}"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + inherit (param) url sha256; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index a41d546e9cf0..f5e000f3980c 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"; }; - buildInputs = [ guile pkgconfig cairo expat ] + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ guile cairo expat ] ++ stdenv.lib.optional doCheck guile-lib; doCheck = true; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index e79a4bec8050..b08d8313930b 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; - buildInputs = [ pkgconfig guile texinfo ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile texinfo ]; preConfigure = '' configureFlags=" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ac1420051da4..104405725975 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -56,16 +56,14 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; + hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; + http-streams = dontCheck super.http-streams; nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - http-streams = dontCheck super.http-streams; - - # https://github.com/hspec/hspec/issues/330 - hspec-core = dontCheck (super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }); # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; @@ -100,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "03fa03n4zkpj5z3ma1ahvnxd85dni2aikqayqf838jvfl7bd5b9n"; + sha256 = "0ky3avbda1avccalkh7ifjnll37cjjmdyypw9m1glsrzgzmr5lbr"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -977,4 +975,7 @@ self: super: { # Break "hpack >=0.17.0 && <0.19". stack = doJailbreak super.stack; + # https://github.com/mgajda/json-autotype/issues/15 + json-autotype = doJailbreak super.json-autotype; + } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 06903d833588..5d8a28f5c2b0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -152,10 +152,11 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; + nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++ + buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ + optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs optional isGhcjs nativeGhc ++ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 749e0e1beb58..5524dce42d94 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2608,6 +2608,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cassava" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring + , bytestring-builder, containers, deepseq, hashable, HUnit, Only + , QuickCheck, quickcheck-instances, scientific, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector + }: + mkDerivation { + pname = "Cassava"; + version = "0.5.1.0"; + sha256 = "1z9y8vzsb0qxfx72w0nb77n0ibha48dv4sg3wv02xrrbz95nwlrh"; + revision = "1"; + editedCabalFile = "1ijb77wqccqgjq0g04m3rk3iygm6hwbmrc50svah19vpl3mkz102"; + libraryHaskellDepends = [ + array attoparsec base bytestring bytestring-builder containers + deepseq hashable Only scientific text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector + ]; + homepage = "https://github.com/hvr/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Catana" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -5723,7 +5750,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Frames_0_2_1" = callPackage + "Frames_0_2_1_1" = callPackage ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml , HUnit, pipes, pretty, primitive, readable, regex-applicative , template-haskell, temporary, text, transformers @@ -5731,8 +5758,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.2.1"; - sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q"; + version = "0.2.1.1"; + sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6235,8 +6262,8 @@ self: { }: mkDerivation { pname = "GenI"; - version = "0.25.0"; - sha256 = "1mxx8mcrlq54gb436jyk8g9k2i56ybp3m3gzi7bmjda6qpf7b8l8"; + version = "0.25.0.1"; + sha256 = "0jdalwm1qhr0adlxfbmw7valqiqmfziv4xrlyprw2nycic99p7gm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -6509,6 +6536,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_9_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.9.0"; + sha256 = "08q2s8ms5klir1pipbsvb5pwdh6hj784p9dkbph7spk2jcqm67lv"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -9018,8 +9069,8 @@ self: { pname = "HarmTrace"; version = "2.2.1"; sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj"; - revision = "1"; - editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g"; + revision = "2"; + editedCabalFile = "0n1qh6bn1r7hwa7aafgs7pvjh8c1qavq2s9vc56989p73llwl1qr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9039,8 +9090,8 @@ self: { }: mkDerivation { pname = "HarmTrace-Base"; - version = "1.5.3.1"; - sha256 = "1plr7rf8658pbys7gw78xsqqjnn0pm84am88hp2iawsi20qfz9mf"; + version = "1.6.0.0"; + sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -20056,17 +20107,17 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , c2hs, Cabal, cereal, containers, directory, dlist, fclabels - , filepath, ghc, ghc-prim, libffi, llvm-hs, llvm-hs-pure, mtl - , template-haskell, time, unix, vector + , filepath, ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure + , mtl, template-haskell, time, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.1.0.0"; - sha256 = "0jg46i12vxf4fr5w0s8wwdh701ba088l4ign7yfvmzbhgcpvan5d"; + version = "1.1.0.1"; + sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring Cabal cereal containers - directory dlist fclabels filepath ghc ghc-prim libffi llvm-hs - llvm-hs-pure mtl template-haskell time unix vector + directory dlist fclabels filepath ghc ghc-prim hashable libffi + llvm-hs llvm-hs-pure mtl template-haskell time unique unix vector ]; libraryToolDepends = [ c2hs ]; description = "Accelerate backend for multicore CPUs"; @@ -21639,6 +21690,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-injector_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, deepseq + , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific + , servant-docs, swagger2, tasty, tasty-hunit, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-injector"; + version = "1.1.0.0"; + sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf"; + libraryHaskellDepends = [ + aeson base bifunctors deepseq hashable lens servant-docs swagger2 + text unordered-containers + ]; + testHaskellDepends = [ + aeson base containers HUnit lens QuickCheck quickcheck-text + scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector + ]; + description = "Injecting fields into aeson values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-iproute" = callPackage ({ mkDerivation, aeson, base, iproute, text }: mkDerivation { @@ -22401,8 +22475,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4"; - sha256 = "0p18s265yf2ficygvgzrngl2ax1zf73h56mz3jv3iigjrsjf4rj2"; + version = "0.7.4.2"; + sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -25671,6 +25745,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ansigraph_0_3_0_4" = callPackage + ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: + mkDerivation { + pname = "ansigraph"; + version = "0.3.0.4"; + sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9"; + libraryHaskellDepends = [ ansi-terminal base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/BlackBrane/ansigraph"; + description = "Terminal-based graphing via ANSI and Unicode"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antagonist" = callPackage ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge , mtl, shakespeare, text, time, time-locale-compat, yesod @@ -29800,6 +29888,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aws_0_17_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, byteable, bytestring + , case-insensitive, cereal, conduit, conduit-combinators + , conduit-extra, containers, cryptohash, data-default, directory + , errors, filepath, http-client, http-client-tls, http-conduit + , http-types, lifted-base, monad-control, mtl, network, old-locale + , QuickCheck, quickcheck-instances, resourcet, safe, scientific + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-base, unordered-containers + , utf8-string, vector, xml-conduit + }: + mkDerivation { + pname = "aws"; + version = "0.17.1"; + sha256 = "1q4qh58vj8447a4fl88n3nkpdc4yv293qsh02w6zvszd6ch61yh7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + blaze-builder byteable bytestring case-insensitive cereal conduit + conduit-extra containers cryptohash data-default directory filepath + http-conduit http-types lifted-base monad-control mtl network + old-locale resourcet safe scientific tagged text time transformers + unordered-containers utf8-string vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring conduit-combinators errors http-client + http-client-tls http-types lifted-base monad-control mtl QuickCheck + quickcheck-instances resourcet tagged tasty tasty-hunit + tasty-quickcheck text time transformers transformers-base + ]; + homepage = "http://github.com/aristidb/aws"; + description = "Amazon Web Services (AWS) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -34567,6 +34693,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; + "bitset-word8" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck + , template-haskell, th-lift-instances + }: + mkDerivation { + pname = "bitset-word8"; + version = "0.1.0.1"; + sha256 = "1lsjaxv7858r5xl8a0lffghlmj3w853ndmmfybki7cfwcqr3mhk2"; + libraryHaskellDepends = [ + base bytestring containers template-haskell th-lift-instances + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nshimaza/bitset-word8#readme"; + description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; + license = stdenv.lib.licenses.mit; + }) {}; + "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib , bindings-gobject, gtk2, pango @@ -36654,7 +36797,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_24_2" = callPackage + "brick_0_26_1" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36662,8 +36805,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.24.2"; - sha256 = "162p1sgiq25zymjnvjzkbblwwl7544ph7y8kpa1x07w7x9bq2jw3"; + version = "0.26.1"; + sha256 = "05jajgb0k1346gg4jc44d921x1bsjwxsaw0ibrf3icaq7x5m11rk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37417,8 +37560,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.1.0.2"; - sha256 = "0pwlmz3ns4fiq1w0c0a9di0q1z9jc009si0imh7j48iswakm0la1"; + version = "1.2.0.0"; + sha256 = "0i18j6pw67bh2bb04zh4x4cbxyy9n7x65yyqfcl3qvl7mz4wzd7k"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -37997,13 +38140,13 @@ self: { }) {}; "byteunits" = callPackage - ({ mkDerivation, base, Cabal, QuickCheck, safe }: + ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.2.0.2"; - sha256 = "1n0gbjjhxx6rv07sck3bx70bd96pkgl0vx5qyqbby9gdfndil4vl"; + version = "0.3.0.2"; + sha256 = "1nfr56zxzvh0lf2qqmjb2jiaslmsr4a73bflvh9y5zqp1aivchgq"; libraryHaskellDepends = [ base safe ]; - testHaskellDepends = [ base Cabal QuickCheck ]; + testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -38075,8 +38218,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.0.1"; - sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4"; + version = "0.1.2.0"; + sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45721,19 +45864,19 @@ self: { "colorless" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, scientific, text, unordered-containers, vector + , random, scientific, text, tuple, unordered-containers, vector }: mkDerivation { pname = "colorless"; - version = "2.1.0"; - sha256 = "1dr8isfvwhfh3j59yrvvyjrqq17iw0qi5xapfhgv7xjsq8lw2wpx"; + version = "2.2.4"; + sha256 = "0w9mrdfnj0g1dis88zbpcfjwxl3n3m93k14rwvy4lwxpykafjvr5"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base containers hspec scientific text vector + aeson base containers hspec scientific text tuple vector ]; description = "Colorless"; license = stdenv.lib.licenses.bsd3; @@ -47191,14 +47334,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_0_0" = callPackage + "concurrency_1_2_1_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.0.0"; - sha256 = "08mqacgidcqsr633h4msbq2as8q1j5fim0jz9j46lpd1p1ksygn5"; + version = "1.2.1.0"; + sha256 = "1361ywfwbymnw1siaysswl0hfh5hq8zgzkazy226civxcap4pi47"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47570,8 +47713,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.4.0"; - sha256 = "0d142r0ljcdyd6z92k4nn19a0sain4fdqmfdr1wiibwq4bdcfzqw"; + version = "0.0.5.0"; + sha256 = "0c8r4iydvzlp1q2szqnxpk8g95dn905ymzsa3isxdh9cjjqm5lbi"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -50520,14 +50663,18 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, QuickCheck, tasty + ({ mkDerivation, base, containers, enummapset, lattices, microlens + , microlens-ghc, microlens-mtl, mtl, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { pname = "crdt"; - version = "0.5"; - sha256 = "11svy9z96964b9cfh2x7cnibq785vnb4v9r6jvhbakda634c61mg"; - libraryHaskellDepends = [ base containers ]; + version = "1.0"; + sha256 = "0s9naq4bakivgs9bqjrp9pli3yfj9ync69pif61q7jsb0gw8w9ny"; + libraryHaskellDepends = [ + base containers enummapset lattices microlens microlens-ghc + microlens-mtl mtl + ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck ]; @@ -57122,8 +57269,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.1.0"; - sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1"; + version = "0.1.1.1"; + sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -58782,8 +58929,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: mkDerivation { pname = "dimensions"; - version = "0.3.0.0"; - sha256 = "00932v3j629ik2n4flq74zcxvvqxgsl88sifyn2ppdwvp535cmhm"; + version = "0.3.1.0"; + sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/achirkin/easytensor#readme"; @@ -59398,6 +59545,18 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "display" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "display"; + version = "0.0.0"; + sha256 = "1z5spl8l4n2x17szlyra2m1973ppgd9xqw851zgnmrvlp79gr0ls"; + libraryHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/chrisdone/display#readme"; + description = "Display things for humans to read"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "display-haskell-do" = callPackage ({ mkDerivation, aeson, base, text }: mkDerivation { @@ -59967,8 +60126,8 @@ self: { }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.10"; - sha256 = "08fmyqiwxi0r8v1qndgjnj6gd74982sdailkxv4471kbskhr9dnp"; + version = "0.4.11"; + sha256 = "0rpmmyl3bal61q1gg6kk57i8whvard8r6f6w57pdgspp2sy5bhh7"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch @@ -60540,8 +60699,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.4.0.2"; - sha256 = "1y2bk71zz3m6dm9b1cnkfyvi2x62v1kc08h9pbpxs43r82fz2xa0"; + version = "0.4.1.0"; + sha256 = "1ywqi7mcyb39fir040gfnk8cb57ysa8mnhcss5x2jvhgqfg3vffw"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -61041,28 +61200,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_0_2" = callPackage + "dotenv_0_5_1_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.0.2"; - sha256 = "0jdm8ci2d1iafxiq8r27iclmgrmr9d3md3slc0wv01magsdsl0hb"; + version = "0.5.1.0"; + sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers + base base-compat exceptions megaparsec process text transformers ]; executableHaskellDepends = [ base base-compat megaparsec optparse-applicative process text transformers ]; testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers + base base-compat exceptions hspec hspec-megaparsec megaparsec + process text transformers ]; homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; @@ -62285,9 +62444,11 @@ self: { pname = "dyckword"; version = "0.1.0.4"; sha256 = "1904dy0f30jbv3b43vpkfsczr27xsfsnvmh21xhd9y4lvdah0rbr"; + revision = "1"; + editedCabalFile = "0w0az7jkkyfvaldh44b9pmqlwrfvjxmfk07hvrdiwxl62klg4plq"; libraryHaskellDepends = [ base exact-combinatorics text ]; testHaskellDepends = [ ansi-terminal base hspec text ]; - homepage = "https://github.com/johanneshilden/dyckword#readme"; + homepage = "https://github.com/laserpants/dyckword#readme"; description = "A library for working with binary Dyck words"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62740,14 +62901,14 @@ self: { }: mkDerivation { pname = "easytensor"; - version = "0.3.0.0"; - sha256 = "1a6y6lrnc82354jqfrns4bb3pwhiwnidfcgfwzg38wsdmpq5rhg9"; + version = "0.3.1.0"; + sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b"; libraryHaskellDepends = [ base dimensions ghc-prim ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; homepage = "https://github.com/achirkin/easytensor#readme"; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -65623,10 +65784,8 @@ self: { }: mkDerivation { pname = "ersatz-toysat"; - version = "0.2.1.0"; - sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq"; - revision = "1"; - editedCabalFile = "0xkpi1m3brgf4mkqmzv45a9wfmvj09hp0bzcq0kcv47p7p5qcvql"; + version = "0.2.2.0"; + sha256 = "056yyls1mhl20sbngk43lip9gi092c1da0snx6fcs0vbv8gm0j4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65878,20 +66037,23 @@ self: { }) {}; "ethereum-analyzer" = callPackage - ({ mkDerivation, base, bimap, bytestring, containers - , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl - , hspec, text + ({ mkDerivation, aeson, base, bimap, bytestring, containers + , ethereum-analyzer-deps, extra, fgl, GenericPretty, graphviz + , hexstring, hoopl, hspec, pretty, protolude, split, text + , unordered-containers, wl-pprint-text }: mkDerivation { pname = "ethereum-analyzer"; - version = "1.3.0"; - sha256 = "18ri9wdcxh10sz5jlgsybjdvbwpcqbq2jjph15iwl4wwmlnzfqx1"; + version = "2.0.0"; + sha256 = "1nrvlziqhszns4hwbhg53k0jcd3xbc4gfg60snvh4i4x2cj6r3pz"; libraryHaskellDepends = [ - base bimap bytestring containers ethereum-analyzer-deps extra fgl - graphviz hexstring hoopl text + aeson base bimap bytestring containers ethereum-analyzer-deps extra + fgl GenericPretty graphviz hexstring hoopl pretty protolude split + text unordered-containers wl-pprint-text ]; testHaskellDepends = [ - base bytestring ethereum-analyzer-deps extra hoopl hspec text + base bytestring ethereum-analyzer-deps extra GenericPretty hoopl + hspec protolude text wl-pprint-text ]; homepage = "https://github.com/ethereumK/ethereum-analyzer"; description = "A Ethereum contract analyzer"; @@ -65903,12 +66065,13 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit-combinators , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl - , protolude, text, tostring, unordered-containers, vector + , optparse-applicative, optparse-text, protolude, text, tostring + , unordered-containers, vector }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "1.3.0"; - sha256 = "0bbqvg6kl4dsfyh9gb9n0bys5v6c4clqf7sg91p5k0znap8sj06c"; + version = "2.0.0"; + sha256 = "12n9x7c6cqki96ydkvb0ldbl3nra1lcvr4p47hnnw3dcna99dxhh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65918,7 +66081,8 @@ self: { unordered-containers vector ]; executableHaskellDepends = [ - base ethereum-analyzer-deps hflags monad-logger protolude + base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger + optparse-applicative optparse-text protolude text ]; homepage = "https://github.com/ethereumK/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; @@ -65933,8 +66097,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "1.3.0"; - sha256 = "102i96a150mm68cxy4qm8pfdzjm0m6ip846g08dzvdx8cl9si1iy"; + version = "2.0.0"; + sha256 = "1kjnxg7j8343amy77m96xx6wzqk4gph1gmpb1ffqky2a70n8bngn"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -65954,8 +66118,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "1.3.0"; - sha256 = "0ffpgb4y25qkbzrarhcnzfq92fal5i1p986cy9ipg3dd7y7dham1"; + version = "2.0.0"; + sha256 = "1b4pc6nfn3cc38n0f8pvgmc32pk1shnm0r9227xxi07093m8az1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68417,8 +68581,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.3.0.1"; - sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15"; + version = "0.3.1"; + sha256 = "0qs3i1cxcdgyi2595qcqalqflpfkqgg6krw7dmjq4kk4pmnm6yw4"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -70114,6 +70278,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "find-clumpiness_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness + , containers, hierarchical-clustering, listsafe, mtl + , optparse-applicative, text, text-show, tree-fun + , unordered-containers, vector + }: + mkDerivation { + pname = "find-clumpiness"; + version = "0.2.3.1"; + sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + hierarchical-clustering listsafe mtl text text-show tree-fun + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + optparse-applicative text tree-fun unordered-containers + ]; + homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; + description = "Find the clumpiness of labels in a tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "find-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -70178,6 +70369,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fingertree_0_1_2_1" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "fingertree"; + version = "0.1.2.1"; + sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fingertree-psqueue" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -72097,20 +72306,22 @@ self: { }) {}; "forest-fire" = callPackage - ({ mkDerivation, aeson, base, bytestring, cli, containers - , pretty-tree, process, text + ({ mkDerivation, aeson, base, bytestring, cli, containers, HUnit + , mtl, process, tasty, tasty-hunit, text }: mkDerivation { pname = "forest-fire"; - version = "0.1.1.1"; - sha256 = "1v8lj9bx0hjkhjr4iv672x84016hsn80nhcfqdknl87vz5bk7z9s"; + version = "0.2"; + sha256 = "1y50nlj2k2glzypr3nvwcx7pdf7bwn0n4d4vks5n8balvx6yaniq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers pretty-tree process text + aeson base bytestring containers process text ]; executableHaskellDepends = [ base cli ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit mtl tasty tasty-hunit + ]; homepage = "https://github.com/toothbrush/forest-fire#readme"; description = "Recursively delete CloudFormation stacks and their dependants"; license = stdenv.lib.licenses.bsd3; @@ -74709,29 +74920,32 @@ self: { "gdax" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base , base64-bytestring, byteable, bytestring, containers, cryptohash - , exceptions, http-client, http-client-tls, lens, lens-aeson, mtl - , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th, text - , time, uuid, vector, websockets, wreq, wuss + , exceptions, hashable, http-client, http-client-tls, lens + , lens-aeson, mtl, regex-tdfa, regex-tdfa-text, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, uuid, vector, websockets, wreq, wuss }: mkDerivation { pname = "gdax"; - version = "0.5.0.1"; - sha256 = "0bjypc6szmdz0ldbbj3n5a4qf78x00yxvml2n647q5p4laan843a"; + version = "0.6.0.0"; + sha256 = "08b7j5dcs5indpd6gb6pc3aw692jqvm26vfnq12mpssdbv7fzf6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring byteable bytestring - cryptohash exceptions http-client http-client-tls lens lens-aeson - mtl scientific text time uuid vector websockets wreq wuss + containers cryptohash exceptions hashable http-client + http-client-tls lens lens-aeson mtl regex-tdfa regex-tdfa-text + scientific text time unordered-containers uuid vector websockets + wreq wuss ]; executableHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring text + aeson aeson-pretty base base64-bytestring bytestring text vector websockets wuss ]; testHaskellDepends = [ - aeson base base64-bytestring bytestring containers exceptions lens - lens-aeson mtl tasty tasty-hunit tasty-quickcheck tasty-th text - time vector websockets wuss + aeson aeson-pretty base base64-bytestring bytestring containers + exceptions lens lens-aeson mtl tasty tasty-hunit tasty-quickcheck + tasty-th text time unordered-containers vector websockets wuss ]; homepage = "https://github.com/AndrewRademacher/gdax"; description = "API Wrapping for Coinbase's GDAX exchange"; @@ -75574,8 +75788,8 @@ self: { }: mkDerivation { pname = "geni-util"; - version = "0.25.0"; - sha256 = "0jpsiydbamyp3c7q61gw8c4jdcdgj7cvavli5x287krpm74s361z"; + version = "0.25.0.1"; + sha256 = "1p62m885w3wpin8g2lcjzrk8a0gslkrxml6d66m38m6lflgwrm6h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76522,6 +76736,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-events_0_7_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.7.0"; + sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base bytestring ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg , filepath, ghc-events, lens, mtl, optparse-applicative, parsec @@ -78680,8 +78914,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170925"; - sha256 = "0kzqndnazqhm777gaym7lp6rknhll3b6lr19y4cxqpr1baslvcf0"; + version = "6.20171003"; + sha256 = "0fyyad5fbdacwyg8b1m6fp1qqkdhp1hgp5r1isivmxfbk15xgvai"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83432,8 +83666,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.4.1.0"; - sha256 = "1qk3inkd9lrvhds553z0jvflpalmr02hgx4656x0qp2yqh9nvp96"; + version = "0.4.2.0"; + sha256 = "11pa89d916c5kk08gwwnsrji4d16ccbqw0wrcn4fnp59nfcjs53l"; libraryHaskellDepends = [ base bytestring cassava containers graphviz hashable process QuickCheck random unordered-containers vector @@ -89591,8 +89825,8 @@ self: { pname = "hashids"; version = "1.0.2.3"; sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; - revision = "1"; - editedCabalFile = "0yp2lsk906qibir9r3lvln44y8lpjx34w7kmwkqw1a5irzpnxnyc"; + revision = "2"; + editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0"; libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; @@ -96782,6 +97016,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hgrep" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, ghc + , ghc-exactprint, hscolour, lens, optparse-applicative, pcre-heavy + , template-haskell + }: + mkDerivation { + pname = "hgrep"; + version = "0.1"; + sha256 = "1pddn24pw8yv1lp3ihbwnanyvrc1nr974sfba2w91shr8m1kimaf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring ghc ghc-exactprint hscolour lens + pcre-heavy template-haskell + ]; + executableHaskellDepends = [ + ansi-terminal base optparse-applicative + ]; + homepage = "https://github.com/thumphries/hgrep"; + description = "Search Haskell source code from the command line"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hgrev" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , process, template-haskell @@ -98376,37 +98633,38 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, directory - , file-embed, filepath, hashable, haskeline, here, hledger-lib - , html, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec - , pretty-show, process, regex-tdfa, safe, shakespeare, split - , tabular, temporary, terminfo, test-framework + , cmdargs, containers, criterion, csv, data-default, Diff + , directory, file-embed, filepath, hashable, haskeline, here + , hledger-lib, html, HUnit, megaparsec, mtl, mtl-compat, old-time + , parsec, pretty-show, process, regex-tdfa, safe, shakespeare + , split, tabular, temporary, terminfo, test-framework , test-framework-hunit, text, time, timeit, transformers - , unordered-containers, utf8-string, wizards + , unordered-containers, utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.3.1"; - sha256 = "0h2ljdncxg5f17llnck6136mn9dn83ql85apnm04sm9cxq7iqqxd"; + version = "1.4"; + sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; revision = "1"; - editedCabalFile = "165jja9hj9f949g26issn8qra7zairm3s48q5kamy6qshbhfy0km"; + editedCabalFile = "16q9ji8qrgpxchxmx0k77qq3hhfz5h09qyc7r3pkav04nx3pv1sg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv - data-default directory file-embed filepath hashable haskeline here - hledger-lib HUnit megaparsec mtl mtl-compat old-time pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo text time transformers unordered-containers utf8-string - wizards + data-default Diff directory file-embed filepath hashable haskeline + here hledger-lib HUnit megaparsec mtl mtl-compat old-time + pretty-show process regex-tdfa safe shakespeare split tabular + temporary terminfo text time transformers unordered-containers + utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv data-default directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary - terminfo text time unordered-containers utf8-string wizards + terminfo text time unordered-containers utf8-string utility-ht + wizards ]; testHaskellDepends = [ ansi-terminal base base-compat bytestring cmdargs containers csv @@ -98414,12 +98672,12 @@ self: { hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards + unordered-containers utf8-string utility-ht wizards ]; benchmarkHaskellDepends = [ ansi-terminal base base-compat criterion directory file-embed - filepath here hledger-lib html pretty-show process tabular - temporary time timeit + filepath here hledger-lib html pretty-show process shakespeare + tabular temporary terminfo time timeit utility-ht ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; @@ -98435,10 +98693,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.3.1"; - sha256 = "149v81qslajzkr13ba7j4qqliagaq88v3d3pw301haf4v3wz9sv4"; - revision = "1"; - editedCabalFile = "11rsyhfxjr87j9m3frnkq6mssj6isay29v61l280a1bd5r58zcr3"; + version = "1.4"; + sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98477,8 +98733,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.10"; - sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y"; + version = "0.2.0.11"; + sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -98499,8 +98755,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "1"; - editedCabalFile = "1mr997ryvxv3aq0km3f1h2y0i79m0lb7pl8mn3way5wa82x10kbg"; + revision = "3"; + editedCabalFile = "0avx22jx969dzg865rgpcvg5n844fqinhsnxir0cbmilpfj5a33k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98571,10 +98827,10 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.3.2"; - sha256 = "1qlfzw8nh4isfjqmnq16qrfas9flhyn2b6mf9nvcg0bgm4m7hs7n"; + version = "1.4"; + sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; revision = "1"; - editedCabalFile = "1frcbzksnpxl6m7jn6sj9am3f65gs5zp1pzr6jb7a5kxkdkpmyv1"; + editedCabalFile = "0nyf7cvv5qhz1n48qj3ib1d56q694zj1b1wfqlrzzfj2a7mi2p4c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring @@ -98605,10 +98861,10 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.3.1"; - sha256 = "1mnvqhp32m9xfyabzl19djy74v5nr9mwaanpnwxqp1wkifq7cmxs"; - revision = "1"; - editedCabalFile = "0va8jvqakgsra3za7k9j8mjmn6k39881zv0l8hh069dhk7yqd49r"; + version = "1.4"; + sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; + revision = "2"; + editedCabalFile = "1cm2nbz0wvy05n33km9h69qwch51gc44dk1jzi26ivqqqxy6h6jj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98654,10 +98910,10 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.3.2"; - sha256 = "0lcrgg6d0gpi9z855byjibzr82bbvmr6bbca5k3ivigd0yzc467d"; + version = "1.4"; + sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; revision = "1"; - editedCabalFile = "11imvlhh7lxml59fncmx5dw76gjfby75czfqz3ywk6zcsznjbl80"; + editedCabalFile = "14ayvky2pjaj2hnxajpb5h0hi2r6fl2ps401abn4apk36y3w16ab"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98665,25 +98921,25 @@ self: { base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl safe shakespeare template-haskell text time transformers wai - wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + mtl parsec safe shakespeare template-haskell text time transformers + wai wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static ]; executableHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json parsec safe - shakespeare template-haskell text time transformers wai wai-extra - wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + hledger hledger-lib http-client http-conduit HUnit json megaparsec + mtl parsec safe shakespeare template-haskell text time transformers + wai wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static ]; testHaskellDepends = [ base base-compat blaze-html blaze-markup bytestring clientsession cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib hspec http-client http-conduit HUnit json safe - shakespeare template-haskell text time transformers wai wai-extra - wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static yesod-test + hledger hledger-lib hspec http-client http-conduit HUnit json + megaparsec mtl parsec safe shakespeare template-haskell text time + transformers wai wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static yesod-test ]; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; @@ -99605,6 +99861,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson, wai, warp + }: + mkDerivation { + pname = "hoauth2"; + version = "1.4.0"; + sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-conduit http-types text + uri-bytestring wai warp + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -99871,21 +100152,30 @@ self: { }) {}; "hol" = callPackage - ({ mkDerivation, base, bytestring, containers, pretty, QuickCheck - , text, transformers + ({ mkDerivation, base, bytestring, containers, filepath, parsec + , pretty, process, QuickCheck, text, transformers }: mkDerivation { pname = "hol"; - version = "1.1"; - sha256 = "0d3m343zgnffjk5dnv7i5w5nj3jjbw17fnrrwb10vq177fkbq4gz"; + version = "1.2"; + sha256 = "121nz9v05fj7qph9x1c7vg7zasvcm2bdlqsk8y0apvgx1wh58cdp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers pretty text transformers + base bytestring containers filepath parsec pretty process text + transformers + ]; + executableHaskellDepends = [ + base bytestring containers filepath parsec pretty process + QuickCheck text transformers ]; testHaskellDepends = [ - base bytestring containers pretty QuickCheck text transformers + base bytestring containers filepath parsec pretty process + QuickCheck text transformers ]; benchmarkHaskellDepends = [ - base bytestring containers pretty text transformers + base bytestring containers filepath parsec pretty process text + transformers ]; description = "Higher order logic"; license = stdenv.lib.licenses.mit; @@ -101107,8 +101397,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.19.1"; - sha256 = "0ncq8kpmsz6lhqajap9ql5ln3pva9hxwk69hsi3x0dgjvkivpsaf"; + version = "0.19.2"; + sha256 = "0kwsy3qwhvc55czszddbq16nz2wniwx7m04i9fkywxcrifjkk7n4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101443,6 +101733,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpio_0_9_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , doctest, exceptions, filepath, hlint, hspec, monad-control + , monad-logger, mtl, optparse-applicative, protolude, QuickCheck + , text, transformers, transformers-base, unix, unix-bytestring + }: + mkDerivation { + pname = "hpio"; + version = "0.9.0.0"; + sha256 = "1j69y396k08af6pvxj0l1687fdfknsyv3xhy7lhhibglv6nskg48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath + monad-control monad-logger mtl protolude QuickCheck text + transformers transformers-base unix unix-bytestring + ]; + executableHaskellDepends = [ + async base exceptions mtl optparse-applicative protolude text + transformers + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hlint hspec + protolude QuickCheck + ]; + homepage = "https://github.com/quixoftic/hpio#readme"; + description = "Monads for GPIO in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hplayground" = callPackage ({ mkDerivation, base, containers, data-default, haste-compiler , haste-perch, monads-tf, transformers @@ -101925,6 +102246,19 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_2" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.2"; + sha256 = "0nzw06qn8ff6k2bl92fmd1wwxcy8m0r9lm34mg41ffnm8jm2scfn"; + libraryHaskellDepends = [ base syb ]; + homepage = "https://github.com/wilx/hs-bibutils"; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -103972,15 +104306,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_8_0" = callPackage + "hslua_0_9_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.8.0"; - sha256 = "0zl7znhbwnqcdvy9v18x3ch8vxk719k5lx55nr65996wb193nwmc"; + version = "0.9.0"; + sha256 = "1ka6vacjrs4y7c83ay7zpvw3kgv19snb50jmfb8j00dprap5wwgq"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -104017,15 +104351,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hslua-aeson_0_3_0" = callPackage + "hslua-aeson_0_3_0_1" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text , unordered-containers, vector }: mkDerivation { pname = "hslua-aeson"; - version = "0.3.0"; - sha256 = "1vsgncxxdwachbqp7pbckij94621zccz001hs774asvyc12anp38"; + version = "0.3.0.1"; + sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -104457,6 +104791,7 @@ self: { quickcheck-io random setenv silently temporary tf-random time transformers ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; @@ -108344,8 +108679,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.0"; - sha256 = "0l3vyygyan5j52af8g5s24435hxy0pr6j89yqzy5mp3dv12qlr53"; + version = "2.0.1"; + sha256 = "14pgl4q2m0hqz6xnj8gg9n5jlqqvl07xrqw3fn2m4gj9hcf768pq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113545,10 +113880,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.9.2"; - sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; - revision = "2"; - editedCabalFile = "1l6gj2678rbaryby9gzsqvyjyknyfc2r6xj27kbcb02cz4igga7m"; + version = "0.9.3"; + sha256 = "0r8kxdxh08plmal9q2i098hlgxvii67ylprzwqzrwa1i9qlcv7v6"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -121061,8 +121394,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-vhdl"; - version = "0.1.2.8"; - sha256 = "1065j91bzwsn04xgg8sfdpdfvg2630ss6ic37ynibpxm619mq93a"; + version = "0.1.3"; + sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/markus-git/language-vhdl"; description = "VHDL AST and pretty printer in Haskell"; @@ -121299,7 +121632,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lattices_1_6_0" = callPackage + "lattices_1_7" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty , tasty-quickcheck, transformers, universe-base @@ -121308,8 +121641,8 @@ self: { }: mkDerivation { pname = "lattices"; - version = "1.6.0"; - sha256 = "0v0nl212cawd2pwbka7w8vl0gmrf1r0yv40dmwl5ffq33v5ihxd0"; + version = "1.7"; + sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -121344,6 +121677,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lawless-concurrent-machines" = callPackage + ({ mkDerivation, async, base, containers, lifted-async, machines + , monad-control, semigroups, tasty, tasty-hunit, time, transformers + , transformers-base + }: + mkDerivation { + pname = "lawless-concurrent-machines"; + version = "0.3.1"; + sha256 = "17y523yahblrd5zq7f5nvr93fg4bqr9aj0zi915l16ffv8hqvply"; + libraryHaskellDepends = [ + async base containers lifted-async machines monad-control + semigroups time transformers transformers-base + ]; + testHaskellDepends = [ + base machines tasty tasty-hunit time transformers + ]; + benchmarkHaskellDepends = [ base machines time ]; + description = "Concurrent networked stream transducers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lax" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -123065,9 +123419,9 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , boomerang, bytestring, concurrent-machines, containers - , containers-unicode-symbols, contravariant, data-textual, dns - , exceptions, filepath, hjsonschema, lens, lifted-async + , boomerang, bytestring, containers, containers-unicode-symbols + , contravariant, data-textual, dns, exceptions, filepath + , hjsonschema, lawless-concurrent-machines, lens, lifted-async , lifted-base, machines, managed, monad-control, mtl, network , network-ip, parsers, pathtype, protolude, QuickCheck, random , semigroups, stm, stm-chans, stm-containers, temporary @@ -123077,13 +123431,13 @@ self: { }: mkDerivation { pname = "liblawless"; - version = "0.25.2"; - sha256 = "0s1qahk7yabggjv4zkqxiy4yygzbq8zwbh5nvh46zm0r09q802s1"; + version = "0.26.0"; + sha256 = "0izkk1rfiny4fnjazbpq04wzhcjgfwsr9fs10lpn9ifp4ckahynj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring - concurrent-machines containers containers-unicode-symbols - contravariant data-textual dns exceptions hjsonschema lens + containers containers-unicode-symbols contravariant data-textual + dns exceptions hjsonschema lawless-concurrent-machines lens lifted-async lifted-base machines managed monad-control mtl network network-ip parsers pathtype protolude QuickCheck random semigroups stm stm-chans stm-containers temporary text text-printer time @@ -123726,13 +124080,15 @@ self: { }) {}; "light" = callPackage - ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl }: + ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl + , QuickCheck + }: mkDerivation { pname = "light"; - version = "0.2.0.0"; - sha256 = "1nrzh3z2fxkzws80amxw112idwlwb7r07igr0381jryfacip0ryy"; + version = "0.2.0.1"; + sha256 = "1lhwir14di3chnj6xn28cwkzmim5d4cq39da82ils6mhghjgzjbg"; libraryHaskellDepends = [ base containers gjk2d lens linear mtl ]; - testHaskellDepends = [ base containers lens linear ]; + testHaskellDepends = [ base containers lens linear QuickCheck ]; homepage = "https://github.com/suzumiyasmith/light#readme"; description = "a simple physics engine"; license = stdenv.lib.licenses.bsd3; @@ -126252,8 +126608,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.2.2"; - sha256 = "0hxw0j3zp6vs4si1v8ziy0g2a06smny6fmjqhd9v5hvdcfnqnm9b"; + version = "1.2.3"; + sha256 = "0r3f2chnzyizm0kz7crjynycs2kzbvh5aw3a0qwc66gbignjnbkw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127407,6 +127763,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_9" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.9"; + sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text transformers + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-extras" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid , text @@ -127680,6 +128061,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lxd-client" = callPackage + ({ mkDerivation, aeson, async, base, bimap, bytestring, connection + , containers, data-default, directory, either, exceptions, filepath + , hspec, hspec-core, http-api-data, http-client, http-client-tls + , http-media, http-types, mtl, network, random, semigroups, servant + , servant-client, text, tls, transformers, turtle, unix, uuid + , websockets, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "lxd-client"; + version = "0.1.0.2"; + sha256 = "1m1rqzbjnd73p6y2iak5fpdq15n52pn2lancvr5s0japw45knqhz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bimap bytestring connection containers + data-default directory either exceptions filepath http-api-data + http-client http-client-tls http-media http-types mtl network + semigroups servant servant-client text tls transformers unix + websockets x509 x509-store x509-validation + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base exceptions hspec hspec-core random text turtle uuid + ]; + homepage = "https://github.com/hverr/haskell-lxd-client#readme"; + description = "LXD client written in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "lye" = callPackage ({ mkDerivation, base, containers, free, HCodecs, lens, parsers , transformers, trifecta @@ -128102,8 +128513,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.5"; - sha256 = "17ppg6nzm8q6fz1y630vzda1rgc8fkhxhjabmvis79h2k3q994s5"; + version = "0.1.0"; + sha256 = "0x1i311281pswpcgwgjfhk4x2576h8ycg1i3ira29hyph1q0r7a0"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -128171,8 +128582,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.0.2"; - sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss"; + version = "2.4.1.3"; + sha256 = "1766dk570fpakjxbk50ll8a29kl67s4wvkwwifacz1h39iqj8984"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128185,7 +128596,7 @@ self: { base hspec hspec-megaparsec megaparsec mtl text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; - homepage = "https://github.com/vmchale/madlang#readme"; + homepage = "https://hub.darcs.net/vmchale/madlang"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129347,15 +129758,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "markup_4_0_1" = callPackage + "markup_4_0_3" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad , lucid, mmorph, monad-control, monad-logger, mtl, path-extra , resourcet, text, transformers-base, urlpath }: mkDerivation { pname = "markup"; - version = "4.0.1"; - sha256 = "1g2vdwwk0if46q0gc1gw4zpbxjbq6lpii0yab6yazdk4a2snakmx"; + version = "4.0.3"; + sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3"; libraryHaskellDepends = [ base blaze-html blaze-markup clay comonad lucid mmorph monad-control monad-logger mtl path-extra resourcet text @@ -131185,6 +131596,8 @@ self: { pname = "mercury-api"; version = "0.1.0.1"; sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; + revision = "1"; + editedCabalFile = "0k8k9lcvpwkvz4w0ydrxzzmfgch8885h6vdybvqi7ra4kvhf4gzs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135290,8 +135703,8 @@ self: { }: mkDerivation { pname = "morph"; - version = "0.1.1.1"; - sha256 = "1p25jy5ri2jlxsrbw8c12zvhc625bfh0zba9bjy9vx3yg5wmaciv"; + version = "0.1.1.2"; + sha256 = "0imhi6yd7phfgd8mykdcd6p1fs28rzp367pzpznrg41nh7arjv6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139987,6 +140400,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-tests_0_2_4_2" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl + , network-transport, random + }: + mkDerivation { + pname = "network-transport-tests"; + version = "0.2.4.2"; + sha256 = "1iyb4zm2iw805qfnlhnlwm2hh1ajhzgzlghsn8g3hnpdgszw896b"; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers mtl network-transport + random + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Unit tests for Network.Transport implementations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , criterion, data-accessor, distributed-process @@ -140411,8 +140842,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.0.5"; - sha256 = "1qiaz3jah863xzbzck2dndy06rhizb6nniqnn38n32nln3bsmqcz"; + version = "0.8.0.7"; + sha256 = "0k8ncavrwkq6wmn8yb87cb9cz6m47iw94k4nl2b0pc1ziik7klip"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -143034,6 +143465,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, semigroups, text + , time, time-locale-compat, transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.0.0"; + sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant dotenv hspec hspec-discover + multiset postgresql-simple product-profunctors profunctors + QuickCheck semigroups text time transformers + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -143386,15 +143845,15 @@ self: { "openflow" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers - , deepseq-generics, hashable, network + , deepseq, deepseq-generics, hashable, network }: mkDerivation { pname = "openflow"; - version = "0.3.0"; - sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2"; + version = "0.3.1"; + sha256 = "0gyld73v5jjfd0ddkp62kxx05f5nr7rnald5ci7r4idp0lwndk22"; libraryHaskellDepends = [ - aeson base bimap binary bytestring containers deepseq-generics - hashable network + aeson base bimap binary bytestring containers deepseq + deepseq-generics hashable network ]; homepage = "https://github.com/AndreasVoellmy/openflow"; description = "OpenFlow"; @@ -149567,8 +150026,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "3"; - editedCabalFile = "0ia214ixkjaz26j998visf4x25g12fwb5z6cpi31r7wz5lhz5z39"; + revision = "5"; + editedCabalFile = "1asqw4k0v57ysi7yqlk506vnkb162swfv2230s8q43r6kvj7171k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153494,8 +153953,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.2.0"; - sha256 = "02ga7i1b4nin05lnh0dwr52w7xhz723an0zlypjccka1i7l42pvz"; + version = "3.3.0"; + sha256 = "0ilny7vj5ch77kic1bmpm160phv3yxm1cd3ksj6j8gc2nvaysrr8"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader @@ -155109,6 +155568,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primes-type" = callPackage + ({ mkDerivation, base, criterion, deepseq, HTF, primes }: + mkDerivation { + pname = "primes-type"; + version = "0.2.0.2"; + sha256 = "0d2nhb0kbpls4ybipnjf2bf73dz1as5qhb0cjz59nmsipkqcr45s"; + libraryHaskellDepends = [ base deepseq primes ]; + testHaskellDepends = [ base HTF primes ]; + benchmarkHaskellDepends = [ base criterion primes ]; + homepage = "https://github.com/kindaro/primes-type#readme"; + description = "Type-safe prime numbers"; + license = stdenv.lib.licenses.isc; + }) {}; + "primesieve" = callPackage ({ mkDerivation, base, foundation, primesieve }: mkDerivation { @@ -155713,6 +156186,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "producer" = callPackage + ({ mkDerivation, base, checkers, QuickCheck, tasty, tasty-auto + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "producer"; + version = "0.1.0.0"; + sha256 = "0dg0yj5b39ghhh6jx9mp9mya3wwzgv6ldkvqxplr1bv3bvxvjkrr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base checkers QuickCheck tasty tasty-auto tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/etorreborre/producer-hs#readme"; + description = "Simple streaming datatype"; + license = stdenv.lib.licenses.mit; + }) {}; + "product-isomorphic" = callPackage ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { @@ -156200,6 +156691,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-effect" = callPackage + ({ mkDerivation, base, bytestring, clock, hashable, http-streams + , http-types, io-streams, mtl, retry, safe-exceptions, streaming + , streaming-bytestring, streaming-utils, streaming-wai, text + , transformers, unordered-containers, vector, vector-algorithms + , wai + }: + mkDerivation { + pname = "prometheus-effect"; + version = "1.0.0"; + sha256 = "132mzsi5g6fmc2141vd1dwix2an0a00xq15ypr74larz7c7v6qk7"; + revision = "1"; + editedCabalFile = "01mkdbif7girjyi3aganp9c8m0di6zv3ddw8brqwlw6r4h3w2imf"; + libraryHaskellDepends = [ + base bytestring clock hashable http-streams http-types io-streams + mtl retry safe-exceptions streaming streaming-bytestring + streaming-utils streaming-wai text transformers + unordered-containers vector vector-algorithms wai + ]; + homepage = "https://github.com/ocharles/prometheus-effect"; + description = "Instrument applications with metrics and publish/push to Prometheus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prometheus-metrics-ghc" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { @@ -160801,15 +161316,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_2_5_2" = callPackage + "rattletrap_3_0_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, filepath, hspec , template-haskell, temporary, text, vector }: mkDerivation { pname = "rattletrap"; - version = "2.5.2"; - sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585"; + version = "3.0.0"; + sha256 = "0n24q5vjbrv093n1nchf7pkn0ibkp75zm5mbjrmdwvr6vlb1ih73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162282,8 +162797,26 @@ self: { pname = "reducers"; version = "3.12.1"; sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4"; - revision = "1"; - editedCabalFile = "1gn2s6r503cmxh8agcbif8q322503ix1igiks4kdz3rn97aliay6"; + revision = "2"; + editedCabalFile = "00zxyyaj0grvr214qdrg68114b93iwp27vmww254s2yq9z701gf8"; + libraryHaskellDepends = [ + array base bytestring containers fingertree hashable semigroupoids + semigroups text transformers unordered-containers + ]; + homepage = "http://github.com/ekmett/reducers/"; + description = "Semigroups, specialized containers and a general map/reduce framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "reducers_3_12_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "reducers"; + version = "3.12.2"; + sha256 = "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids semigroups text transformers unordered-containers @@ -162291,6 +162824,7 @@ self: { homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reedsolomon" = callPackage @@ -164809,6 +165343,7 @@ self: { data-default-class hspec hspec-core http-client http-types mtl QuickCheck text time unordered-containers ]; + doCheck = false; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; @@ -164838,6 +165373,7 @@ self: { data-default-class hspec hspec-core http-client http-types monad-control mtl QuickCheck retry text time unordered-containers ]; + doCheck = false; homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; @@ -167236,9 +167772,9 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_4_1_0" = callPackage - ({ mkDerivation, atom-conduit, base, bytestring, conduit - , conduit-combinators, containers, data-default + "rss-conduit_0_4_2_0" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default , dublincore-xml-conduit, hlint, lens-simple, mono-traversable , QuickCheck, quickcheck-instances, resourcet, safe , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -167247,19 +167783,20 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.1.0"; - sha256 = "0lal33vjsdz5k63ljlx4430an1x3hgw6nn1aixf531bwdglxgg5c"; + version = "0.4.2.0"; + sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons text time timerep uri-bytestring vinyl xml-conduit xml-types ]; testHaskellDepends = [ - atom-conduit base bytestring conduit conduit-combinators - data-default dublincore-xml-conduit hlint lens-simple - mono-traversable QuickCheck quickcheck-instances resourcet - safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text - time uri-bytestring vinyl xml-conduit xml-types + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit hlint + lens-simple mono-traversable QuickCheck quickcheck-instances + resourcet safe-exceptions singletons tasty tasty-hunit + tasty-quickcheck text time uri-bytestring vinyl xml-conduit + xml-types ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; @@ -168844,10 +169381,10 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; - version = "1.1.0"; - sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb"; - revision = "5"; - editedCabalFile = "02p4iy6vypz6q0zh5wmy3lp1s9zrcvqn9xx8vczl8000wa0asn7p"; + version = "1.1.1"; + sha256 = "1hsj1wa4x4qf6vwnxpfl40cx1ghrkdalz5a0nq0si83ykdq14ylf"; + revision = "1"; + editedCabalFile = "0ivxl975nlrpzz3rpq4hc9zi4rp7b3lvjn6izp4l83fm3crkl15i"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ base containers hspec QuickCheck text time @@ -169156,26 +169693,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_3_0_0" = callPackage + "schematic_0_3_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens - , mtl, regex-compat, scientific, singletons, smallcheck, tagged - , text, unordered-containers, validationt, vector, vinyl + , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific + , singletons, smallcheck, tagged, text, unordered-containers + , validationt, vector, vinyl }: mkDerivation { pname = "schematic"; - version = "0.3.0.0"; - sha256 = "0nrq36s646h6lrfqw9hf7ysmc8b2x7dkrj07x1dy2x1ihph5my12"; + version = "0.3.2.0"; + sha256 = "0bzxab3ijnc5qxglcw4kbcznv22r8n11h5qrsgwlyh3r4qa0by72"; libraryHaskellDepends = [ - aeson base bytestring containers hjsonschema mtl regex-compat - scientific singletons smallcheck tagged text unordered-containers - validationt vector vinyl + aeson base bytestring containers hjsonschema mtl profunctors + regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged + text unordered-containers validationt vector vinyl ]; testHaskellDepends = [ aeson base bytestring containers hjsonschema hspec hspec-core - hspec-discover hspec-smallcheck HUnit lens regex-compat singletons - smallcheck tagged text unordered-containers validationt vinyl + hspec-discover hspec-smallcheck HUnit lens regex-tdfa + regex-tdfa-text singletons smallcheck tagged text + unordered-containers validationt vinyl ]; + homepage = "http://github.com/typeable/schematic"; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -169931,6 +170471,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scuttlebutt-types" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptonite, ed25519, hspec, memory, text + }: + mkDerivation { + pname = "scuttlebutt-types"; + version = "0.2.0"; + sha256 = "0aghmdc16x0i7mzldx7gdq1n6g81kccq8gp24klf0000vbj8xa7h"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptonite ed25519 memory + text + ]; + testHaskellDepends = [ aeson base bytestring hspec text ]; + description = "generic types for Secure Scuttlebutt"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scyther-proof" = callPackage ({ mkDerivation, alex, array, base, cmdargs, containers, directory , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time @@ -170423,22 +170980,21 @@ self: { }) {}; "secp256k1" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring, Cabal - , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal + , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "secp256k1"; - version = "0.4.8"; - sha256 = "0jnvsfmjrac8l07l32xi1vlbbjpvzhmsb1fv5ajvjkw7yrd4byqk"; + version = "0.5.2"; + sha256 = "1havyn28i2044vxgla2j46qsv4wngy8y6wkkh9v3c1vi35sfzimq"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base base16-bytestring binary bytestring entropy largeword mtl - QuickCheck string-conversions + base base16-bytestring bytestring cereal entropy mtl QuickCheck + string-conversions ]; testHaskellDepends = [ - base base16-bytestring binary bytestring cryptohash entropy HUnit + base base16-bytestring bytestring cereal cryptohash entropy HUnit mtl QuickCheck string-conversions test-framework test-framework-hunit test-framework-quickcheck2 ]; @@ -172697,25 +173253,26 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, filepath, http-client - , http-media, http-types, resourcet, servant, servant-client - , servant-docs, servant-server, text, transformers, wai - , wai-app-static, warp + ({ mkDerivation, base, bytestring, containers, filepath + , http-client, http-media, http-types, lens, resourcet, servant + , servant-client, servant-docs, servant-server, text, transformers + , wai, wai-app-static, warp }: mkDerivation { pname = "servant-rawm"; - version = "0.1.0.0"; - sha256 = "0h3s0sca9x612lr2ndv0vccdyscb93amqiwg511rwh6i5y0jrv7d"; + version = "0.2.0.0"; + sha256 = "029lwzy0r28l1axpmrlcazsqa38q7a6fbq1vzh484dhfy9j2j5wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring filepath http-client http-media http-types - resourcet servant servant-client servant-docs servant-server wai - wai-app-static + base bytestring containers filepath http-client http-media + http-types lens resourcet servant servant-client servant-docs + servant-server wai wai-app-static ]; executableHaskellDepends = [ base bytestring http-client http-media http-types servant - servant-client servant-server text transformers wai warp + servant-client servant-docs servant-server text transformers wai + warp ]; homepage = "https://github.com/cdepillabout/servant-rawm"; description = "Embed a raw 'Application' in a Servant API"; @@ -175965,8 +176522,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.7.0"; - sha256 = "19c7hvjqcdzwvyyas58zyjs1i8zawmnqc84mm5sk7rp0wf3ic6c7"; + version = "0.7.1"; + sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -181699,7 +182256,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_1_2_0" = callPackage + "stache_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec , megaparsec, mtl, template-haskell, text, unordered-containers @@ -181707,8 +182264,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "1.2.0"; - sha256 = "050b7rnwh7cphsakh05s6hjc5ddfm0637yahq1igs0kp32d6pmv0"; + version = "1.2.1"; + sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -183077,8 +183634,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "stemmer-german"; - version = "0.1.1.0"; - sha256 = "1m0jhmdh51g7cqy51h1xqkdiz8il22xkfq5h4vzabllvyiii3anm"; + version = "0.1.1.1"; + sha256 = "037dw03zb4xdfbzp8js04ymrxii7rsin7pwiansa9khb29w2jqsn"; libraryHaskellDepends = [ base text ]; description = "Extract the stem of a German inflected word form"; license = stdenv.lib.licenses.mit; @@ -183639,6 +184196,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-tuple_0_0_3_3" = callPackage + ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: + mkDerivation { + pname = "storable-tuple"; + version = "0.0.3.3"; + sha256 = "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw"; + libraryHaskellDepends = [ + base base-orphans storable-record utility-ht + ]; + homepage = "http://code.haskell.org/~thielema/storable-tuple/"; + description = "Storable instance for pairs and triples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, syb, transformers, unsafe @@ -184544,14 +185116,14 @@ self: { "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , foundation, hashable, text, unordered-containers, vector + , hashable, text, unordered-containers, vector }: mkDerivation { pname = "strict-types"; - version = "0.1.0.6"; - sha256 = "0dp0179g20g62vn6c5wv2d7d9kwwix40rxzwfig6f0pi8rm16jxj"; + version = "0.1.2"; + sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li"; libraryHaskellDepends = [ - array base bytestring containers deepseq foundation hashable text + array base bytestring containers deepseq hashable text unordered-containers vector ]; homepage = "https://github.com/pepeiborra/strict-types"; @@ -185010,6 +185582,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_4_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "4.0.0"; + sha256 = "11z7xxq8157pgpp48argcik0l2323lvjf2rxn01rdk7sx5gby9mh"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -185307,8 +185899,8 @@ self: { }: mkDerivation { pname = "styx"; - version = "1.3"; - sha256 = "0bqpqixdwdh2j28mdg52a0yvzrjs8gwmyapknqb2mlhf1w3f21cp"; + version = "1.3.1"; + sha256 = "0g2pgczmk647ckyfq6yvb8isjjswjvymz4l065w4m79by9wkjlmb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186114,22 +186706,23 @@ self: { }) {}; "swagger-petstore" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, iso8601-time, microlens - , monad-logger, mtl, network, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.1"; - sha256 = "1zpxs97lrpv4ailn6mqdx6ihbzilcsjcycrc8qj1v1f1lg00m9k6"; + version = "0.0.1.2"; + sha256 = "1027kj163mjp78gxl1g77jgxg5n6q5xkhvy4zdx3wlcjc2b3mjah"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-api-data http-client http-client-tls http-media http-types - iso8601-time microlens monad-logger mtl network random - safe-exceptions text time transformers unordered-containers vector + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck @@ -186576,6 +187169,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + "symmetric-properties" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit }: + mkDerivation { + pname = "symmetric-properties"; + version = "0.1.0.0"; + sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base hspec HUnit ]; + homepage = "https://github.com/joelburget/symmetric-properties#readme"; + description = "Monoids for sameness and uniqueness"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "symon" = callPackage ({ mkDerivation, ansi-terminal, base, monad-loops, random }: mkDerivation { @@ -186716,8 +187322,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.6.3"; - sha256 = "1w7kyk4030zy2p200qwb61qf17iasvrpzhpz0n8a186lvikc7dlk"; + version = "3.7"; + sha256 = "1x6hl048247d3h8bi3b94kqmgsmcc0d751n2mdyxim26cg1vnwzf"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -191122,6 +191728,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_9_4_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.9.4.4"; + sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -192269,6 +192900,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_0_2_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.0.2.5"; + sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -192521,6 +193164,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.3"; + sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/khibino/haskell-th-reify-compat/"; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -192891,6 +193547,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "thread-hierarchy" = callPackage + ({ mkDerivation, base, containers, hspec, lifted-base + , monad-control, transformers-base + }: + mkDerivation { + pname = "thread-hierarchy"; + version = "0.1.0.1"; + sha256 = "05qpm77711r9viwij5vznrmk8ij89lxhpwxdk8dpk0rq2ll5iyyq"; + libraryHaskellDepends = [ + base containers lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/nshimaza/thread-hierarchy#readme"; + description = "Simple Haskel thread management in hierarchical manner"; + license = stdenv.lib.licenses.mit; + }) {}; + "thread-local-storage" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { @@ -194482,8 +195155,8 @@ self: { ({ mkDerivation, base, c2hs, text }: mkDerivation { pname = "tinyfiledialogs"; - version = "0.1.0.0"; - sha256 = "0csj7ca5r6vqkviz3q570bsmdssm144sb9wyi7d9jpl0n3khpdm1"; + version = "0.2.0.0"; + sha256 = "16vzn532204vs39lfsf7q20zkhncqgk1vzqls9x2cy8kzdzrqlm4"; libraryHaskellDepends = [ base text ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/mtolly/tinyfiledialogs"; @@ -195780,12 +196453,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_4_0" = callPackage + "transformers_0_5_5_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.4.0"; - sha256 = "16l8p2yq8v12n1ri4zbv04m0acnfl4y69bddbbsmmn52i8rkyzzq"; + version = "0.5.5.0"; + sha256 = "198ric8gr1y58scckr468d11y2g45mzc5pkaa40shj7xgj1bh7mi"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -196325,6 +196998,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "treefold" = callPackage + ({ mkDerivation, base, containers, criterion, doctest, hedgehog + , parallel, random + }: + mkDerivation { + pname = "treefold"; + version = "0.2.0.0"; + sha256 = "0kzx1p9cznj8v0c7bhjj503qav2c9b4dw67likvzqrdqf348vhs5"; + libraryHaskellDepends = [ base parallel ]; + testHaskellDepends = [ base doctest hedgehog ]; + benchmarkHaskellDepends = [ base containers criterion random ]; + homepage = "https://github.com/oisdk/treefold"; + description = "Provides folds which try to combine elements in a balanced way"; + license = stdenv.lib.licenses.mit; + }) {}; + "treemap" = callPackage ({ mkDerivation, base, containers, deepseq, semigroups, strict , tasty, tasty-hunit, text, transformers @@ -198687,8 +199376,8 @@ self: { }: mkDerivation { pname = "typed-wire-utils"; - version = "0.1.0.0"; - sha256 = "0c5j3akhbimppfx9vsz5d93jil67ml58pn249sgmczg22ybg5v96"; + version = "0.2.0.0"; + sha256 = "0v5gdydkd2gr3rb2p7js19j3w1v8zzck65mfywmlihp3ngfb8h2d"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring text time ]; @@ -201232,8 +201921,8 @@ self: { }: mkDerivation { pname = "uri-parse"; - version = "0.1.0.0"; - sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx"; + version = "0.1.0.1"; + sha256 = "0dw9wms9x50yf0snk0qv628nmxsdp3ksnmjqz66lhdfzd1s5zv0k"; libraryHaskellDepends = [ attoparsec base bytestring data-default http-types lens text ]; @@ -201428,7 +202117,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "urlpath_6_0_3" = callPackage + "urlpath_7_0_0" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph , monad-control, monad-control-aligned, monad-logger, mtl , path-extra, resourcet, split, strict, text, transformers @@ -201436,8 +202125,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "6.0.3"; - sha256 = "0nyh47ra4y8q2pjbd1azkg0khqpq9qw2k8dxnhv4jf8jvjpf9zrk"; + version = "7.0.0"; + sha256 = "0al003vwbr286rj9la5w01zfj1q3jccfia6iy38w3d0hajkmw6qj"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control monad-control-aligned monad-logger mtl path-extra resourcet split @@ -203358,12 +204047,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_11" = callPackage + "vector-space_0_12" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.11"; - sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h"; + version = "0.12"; + sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -208163,8 +208852,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wiringPi"; - version = "1.0.1"; - sha256 = "1i4sidhhwmvn15996cv4415nylcra204pa51zd133pnckcqxbb5k"; + version = "1.0.1.1"; + sha256 = "12n21ycl977pw848mh26pplckgrdxrndv7igii99ypvrp0n307ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -210546,6 +211235,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit-writer_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, data-default, dlist, mtl, text + , xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-conduit-writer"; + version = "0.1.1.2"; + sha256 = "0n5fk6sj5grcfz51psbf8h4z40hd4dk8zpk870c6ipm2s9dc1488"; + libraryHaskellDepends = [ + base containers data-default dlist mtl text xml-conduit xml-types + ]; + testHaskellDepends = [ base text ]; + homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; + description = "Warm and fuzzy creation of XML documents"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , blaze-builder, blaze-builder-enumerator, bytestring, containers @@ -212268,8 +212975,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.3.1"; - sha256 = "0plsv7qhl43y85dwzybbik2fx1bm23lz8m5l1fyhd363v9f2df7x"; + version = "0.3.4"; + sha256 = "0w7ss3lpx37bm3cqigjgddjqm6pwi5117mz60jyw1d70xrgw8wbz"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 8f83a338484c..78598ce3d81e 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -22,6 +22,8 @@ in buildInputs = [ erlang rebar makeWrapper ]; + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${pkgs.glibcLocales}/lib/locale/locale-archive"; LANG = "en_US.UTF-8"; LC_TYPE = "en_US.UTF-8"; @@ -30,8 +32,8 @@ in inherit debugInfo; buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; + then "ERL_COMPILER_OPTIONS=debug_info" + else ""; preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 897f84f94ada..af728b942ebb 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -47,9 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; - buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] + buildInputs = [ ncurses openssl ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 4c4a4a0c8947..857a1e5cd8df 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; - buildInputs = [ cmake pkgconfig pcre zlib sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pcre zlib sqlite ]; meta = with stdenv.lib; { description = "Programming language with macros and syntax at once"; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 381144c68c2c..ab295dab4443 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb"; }; - buildInputs = [ libffcall gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libffcall gtk2 ]; configureOptions = [ "--with-gtk2" ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index a7be084991ba..255bd0351298 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 09f7e39196cc..114749e90da3 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL mesa openal lua + SDL mesa openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 2b19f18b3ef3..4e999eca9eeb 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL mesa openal lua + SDL mesa openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 9a9de2ad6f55..83c485f065dd 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig SDL2 mesa openal luajit + SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index dea3f6ec633a..7f38f388c354 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - buildInputs = [ pkgconfig nix git ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e1704a2ec488..57383fa34126 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -20,7 +20,8 @@ let enableParallelBuilding = true; - buildInputs = [ flex bison pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison ] ++ lib.optional stdenv.isLinux systemd; flags = { diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 08ed8f0d4689..b196af8e3ae4 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -32,8 +32,8 @@ let build = {flags, target}: stdenv.mkDerivation rec { name = "pixie-${version}"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = libs; - buildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" else "${python2.interpreter}"; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 0ea70cc022db..1d382207e989 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - buildInputs = [ bzip2 openssl pkgconfig pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index c2eae32c5b60..cc3eba52bf2d 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation { sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python cython pkgconfig wrapPython + python cython wrapPython SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2e7d7f97819a..d664c00bc31d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -66,8 +66,9 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; - buildInputs = ops useRailsExpress [ autoreconfHook bison ] - ++ (op fiddleSupport libffi) + nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ]; + buildInputs = + (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) ++ (op docSupport groff) ++ (op zlibSupport zlib) @@ -196,11 +197,11 @@ in { }; }; - ruby_2_2_7 = generic { - version = rubyVersion "2" "2" "7" ""; + ruby_2_2_8 = generic { + version = rubyVersion "2" "2" "8" ""; sha256 = { - src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; - git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; + src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; + git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 5bc1b858425b..3d3b17cd2f70 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,7 +24,7 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.7" = ops useRailsExpress [ + "2.2.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index ed09ac7467d4..9a14beb856b6 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip ]; - nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; + nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213; + buildInputs = [ perl python2 zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index 33acb792f761..da5fc193a222 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl python2 zip libffi readline ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 5b8e887c2eee..6279bfcb4286 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-video-sixel" ]; - buildInputs = [ pkgconfig libsixel ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsixel ]; meta = with stdenv.lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 50399f62d0a5..8cadc7290aa9 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { ]; sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi"; }; - buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 7c697d3e60c9..b398af0db344 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; }; - buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib curl expat fuse openssl python ]; meta = { homepage = http://afflib.sourceforge.net/; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 866bccd3fd61..815e0f20b54e 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.13"; + version = "0.14"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5"; + sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 8b8d3a29193f..2edf4e232260 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "http://www.antigrain.com/${name}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; - buildInputs = [ autoconf automake libtool pkgconfig freetype SDL libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool freetype SDL libX11 ]; # fix build with new automake, from Gentoo ebuild preConfigure = '' diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index e1c729050d4f..15331c22599b 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,33 +1,25 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - # The 'src' 7.0.0.3 expects amrwb 700, but there is only 710 available now, - # so I guess in 3gpp they updated to 7.1.0, but amrwb did not update the libraries. - # I guess amrwb uses the first version numbers to match those of 3gpp, - # so I set the name to 7.1.0.3 in this case - name = "amrwb-7.1.0.3"; +stdenv.mkDerivation rec { + name = "amrwb-${version}"; + version = "11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26204-710.zip; - sha256 = "1wnx72m20y8bdlyndyy8rskr0hi4llk1h1hcr34awxfmi9l4922i"; + url = http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip; + sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8"; }; src = fetchurl { - url = http://www.penguin.cz/~utx/ftp/amr/amrwb-7.0.0.3.tar.bz2; - sha256 = "0nn94i3gw3d5fgks43wdhshdlhpd4rcrzj46f2vsby0viwkxxp8z"; + url = "http://www.penguin.cz/~utx/ftp/amr/amrwb-${version}.tar.bz2"; + sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw"; }; buildInputs = [ unzip ]; - patchPhase = '' - sed -i s/26204-700/26204-710/g Makefile.am Makefile.in configure configure.ac \ - prepare_sources.sh.in - ''; - configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; postConfigure = '' - cp $srcAmr 26204-710.zip + cp $srcAmr 26204-b00.zip ''; meta = { diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 3aef90594a15..e2350cf2cd13 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index bd8588f9771f..95de186a29a3 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig popt intltool dbus_glib + python popt intltool dbus_glib libX11 xextproto libSM libICE libXtst libXi gobjectIntrospection ]; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 5dac4d8e5925..7057b020d429 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; }; - buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ]; meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index a21f698fa896..3a4c363e23c8 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; - buildInputs = [ pkgconfig libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index dce2e363cda5..fe0e0854a327 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - buildInputs = [ autoreconfHook glib pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "A C library for reading and writing Standard MIDI Files"; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 87ff0bdb0b6e..427625d6fc67 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; - buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python serd sord sratom ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index dafd39efee98..3df8f5e30789 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq"; }; - buildInputs = [ gtk2 libsndfile pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 034282c4f3a5..595dd9e0a536 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; }; - buildInputs = [ gtk2 libsndfile pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libsndfile python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 35144862ce9b..6e7cb8d020bd 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }: stdenv.mkDerivation rec { name = "ntk-${version}"; - version = "2017-04-22"; - src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/non/fltk.git"; - rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff"; - sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq"; + version = "1.3.1000"; + src = fetchFromGitHub { + owner = "original-male"; + repo = "ntk"; + rev = "v${version}"; + sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cairo libjpeg libXft pkgconfig python2 + cairo libjpeg libXft python2 ]; buildPhase = '' @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { version = "${version}"; homepage = http://non.tuxfamily.org/; license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 94102c385497..b0b0c6bc59af 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; }; - buildInputs = [ boost gtk2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost gtk2 python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index b41db495dbae..022c55045967 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96"; }; - buildInputs = [ autoconf automake libtool libjack2 alsaLib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; preConfigure = '' ./autogen.sh --no-configure diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 816baa5221e6..d30cb1d369eb 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; - buildInputs = [ lv2 pkgconfig python serd sord ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lv2 python serd sord ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8864d710174a..b2cfb0be8bec 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index f4c4220a8792..8cae07e29490 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -13,7 +13,8 @@ rec { sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv"; }; - buildInputs = [ pkgconfig libsndfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; meta = with stdenv.lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 78867881dc32..a7576e07f2dd 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -3,10 +3,12 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.6"; - nativeBuildInputs = stdenv.lib.optional stdenv.isLinux alsaLib; - - buildInputs = (stdenv.lib.optional stdenv.isDarwin CoreServices) ++ - (stdenv.lib.optional stdenv.isDarwin AudioUnit); + buildInputs = + stdenv.lib.optionals stdenv.isLinux [ + alsaLib + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreServices AudioUnit + ]; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 9cf4bb22e58d..e6702d0db640 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; }; - buildInputs = [ pkgconfig cmake libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libuuid ]; meta = { homepage = http://www.crosswire.org/wiki/BibleSync; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 498c8f005f0f..5ae9ead9ced4 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; - buildInputs = [ pkgconfig gfortran texinfo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gfortran texinfo ] ++ optional (boost != null) boost; configureFlags = diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 25d291da3327..61f0fac7ffd0 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sourceRoot = "Box2D-${version}/Box2D"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig + unzip cmake mesa freeglut libX11 xproto inputproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 0bdffc9d3570..bd83a5c79d55 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn"; }; - buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libgcrypt commoncpp2 ]; patches = [ ./gcc-4.6-fix.patch ]; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 13a9259fdec9..5df7c2279c55 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ ucommon openssl libgcrypt ]; configureFlags = [ diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 4d30afe6818c..a4f49dea59af 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { src = source.src; - buildInputs = [ cmake pkgconfig libtiff ilmbase openexr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libtiff ilmbase openexr ]; meta = with stdenv.lib; { description = "Color Transformation Language"; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 6ee04ae57952..fd8fa1a994d6 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { homepage = http://ctpl.tuxfamily.org/; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 5bf9832843b4..ee7afbbf2522 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; })]; - buildInputs = [ dbus glib pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus glib expat ]; configureFlags = "--disable-ecore"; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index b4dd865dec01..fc533c277bb0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] + buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 61a85c7cd607..efadff6a1138 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "A configuration parser library"; diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index 02a422c2c843..7363a0239352 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"; }; - buildInputs = [aspell pkgconfig glib hunspell hspell]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [aspell glib hunspell hspell]; meta = { homepage = http://www.abisource.com/enchant; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index a5dba0c94f12..240f3c136ef5 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libosip openssl pkgconfig ]; + buildInputs = [ libosip openssl ]; meta = with stdenv.lib; { license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index e5b0592daab3..5efa378ff5fa 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; }; - buildInputs = [autoreconfHook givaro_3_7 openblas gmpxx]; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ givaro_3_7 openblas gmpxx]; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; meta = { inherit version; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 22f4b6ceef08..0e4e897e27a4 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; }; - buildInputs = [autoreconfHook givaro (liblapack.override {shared = true;}) openblas]; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; meta = { inherit version; diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index dced5582cf63..a3ce9ea9c2bf 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libsixel yasm ]; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index c6167252866a..9e76c1e64001 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig +{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ ffmpeg libpng ]; + buildInputs = [ ffmpeg libpng libjpeg ]; meta = with stdenv.lib; { homepage = https://github.com/dirkvdb/ffmpegthumbnailer; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index bf690c020cb5..483f02f823fd 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "197cc2a1f045b1666a29a9b5f035b3d676db6db94a4439d99a03b65e551ae2e0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = '' --enable-shared diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 7eaba8f75ec4..3f3c04b15a30 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - buildInputs = [ pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f176aa0878c8..9c4116c8f0ba 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - buildInputs = [ pkgconfig expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ expat ]; configureFlags = [ "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 9614762ef2a3..1c0c4c3ace8e 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; - buildInputs = [ autoconf cairo opencv pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf cairo opencv ]; meta = with stdenv.lib; { homepage = http://frei0r.dyne.org; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 7530d82a7e31..5a21af6a2b33 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtk2 gtkmm2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ graphviz gtk2 gtkmm2 python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 11308a93337e..38a36fc4e546 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1"; }; - buildInputs = [ intltool gobjectIntrospection pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gobjectIntrospection ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index e9f5898e2eac..40e9b0ed90d5 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; }; - buildInputs = [ pkgconfig mono newtonsoft-json ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono newtonsoft-json ]; sourceRoot = "svn-r1217/clients/cs"; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e9643da221ef..306f228051bb 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [pkgconfig glib libxml2 gtkdoc]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 gtkdoc]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 8cc06f9269eb..34da3c1f372c 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; }; + nativeBuildInputs = [ + pkgconfig + ]; + buildInputs = libintlOrEmpty ++ - [ intltool pkgconfig glib json_glib libsoup geoip + [ intltool glib json_glib libsoup geoip dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 433a1722e76f..f75290005391 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; - buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; propagatedBuildInputs = [dbus glib dbus_glib]; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 9907ae24f2c9..3101bc64333e 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz"; sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index bb0fd0e08982..d73a448f1662 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz"; sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index d9a8624b2ea2..335afa566dbe 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7"; }; - buildInputs = [autoconf automake libtool autoreconfHook gmpxx]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool gmpxx]; meta = { inherit version; description = ''A C++ library for arithmetic and algebraic computations''; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index a7dd47aaeb4f..5b55a09db625 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; - buildInputs = [ zlib pkgconfig openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib openssl pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index f147305220c7..10df82196c2e 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; - buildInputs = [ pkgconfig globalplatform openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ globalplatform openssl pcsclite ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 6b05bda1b3a7..c9431420194a 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; - buildInputs = [ pkgconfig autoconf automake glib libtool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake glib libtool ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index f95d0720d830..d80144b3d719 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; }; - buildInputs = [ pkgconfig gtk2 mono gtk-sharp-2_0 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); patches = [ ./Makefile.in.patch ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4c1f6135b495..b26ae9c9d612 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; outputMan = "dev"; # tiny pages - buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flex bison python setupHook/*move .gir*/ ] ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix index 2da683fcbeb7..e050a615dd17 100644 --- a/pkgs/development/libraries/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { # fix linking error: undefined reference to pcre_info patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext + libglade bzip2 libart intltool gettext gconf libgnomeui pcre ]; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 080b781ca31a..0f9b3f85fcd8 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - buildInputs = [ gtk2 cairo glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 cairo glib ]; meta = { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index c8b1c0bdd9be..a48490ffae57 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; - buildInputs = [ pkgconfig python3 frame ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python3 frame ] ++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index ee453963376f..be869063111c 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 608be6538890..402074a4e5f4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; }; - buildInputs = [ gst-plugins-base gstreamer pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gst-plugins-base gstreamer ]; meta = { homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index c20d32e810c4..55d34a3fada3 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ perl bison flex pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl bison flex ]; propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; patchPhase = '' diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 8a023be56299..d6f745d399d1 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -9,13 +9,14 @@ let url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip"; sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cdk unzip gtk2 glib ncurses pkgconfig + cdk unzip gtk2 glib ncurses ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index ca6c4d0dfa63..5b3ca828a3f8 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation { done ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono glib pango gtk2 GConf libglade libgnomecanvas + mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 459f37afc7fe..3a473d6303ad 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation { # done # ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 82c4f25f66c9..de5fd8343e3e 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gtk2 ]; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index eb0ba2db1030..20584c3850ad 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - buildInputs = [ pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; preConfigure = '' sed '/DEPRECATED_FLAGS/d' -i configure diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index e36d77142e92..12b9181a952e 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - buildInputs = [pkgconfig t1lib glib gmetadom libxml2 popt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ t1lib glib gmetadom libxml2 popt]; propagatedBuildInputs = [gtk2 t1lib]; patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 22b96abf6429..22094f3a3f64 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk2 enchant intltool]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [aspell gtk2 enchant intltool]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index be2ae0440229..04456b440193 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { gtkspell3 ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk3 glib glibmm gtkmm3 ]; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 17ab80ce5868..59b3a34f7bdd 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - buildInputs = [ glib pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 0157fa1762c7..93f24b0f7225 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt + autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt systemd vala_0_23 glib ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 11c3134e10bb..6eb341d66bce 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation rec { sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; }; - nativeBuildInputs = [ pkgconfig intltool libtool ]; + nativeBuildInputs = [ + pkgconfig intltool libtool + libxml2 libxslt docbook_xsl + ]; buildInputs = [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio - libxml2 libxslt docbook_xsl samba libmtp libcap polkit + samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ gtk libsoup libgnome_keyring gconf gcr diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 80085759a76a..51c369f7c2d4 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; }; - buildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index eced02fd33e3..7b4b9866d041 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook makeWrapper + autoreconfHook makeWrapper perl libxml2 IOStringy ]; diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 2c1ca6aeb1e8..edd35bd27e44 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig mono gtk-sharp-2_0 + mono gtk-sharp-2_0 ]; postPatch = '' diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix new file mode 100644 index 000000000000..e5b80f4b2700 --- /dev/null +++ b/pkgs/development/libraries/icu/58.nix @@ -0,0 +1,14 @@ +args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +let + keywordFix = fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }; +in +import ./base.nix { + version = "58.2"; + sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; + patches = [ keywordFix ]; + patchFlags = "-p4"; +} args diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix new file mode 100644 index 000000000000..9ca66ca525fd --- /dev/null +++ b/pkgs/development/libraries/icu/59.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "59.1"; + sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; +} diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/base.nix index 173c9bb58ad9..78e0c5740446 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,16 +1,8 @@ +{ version, sha256, patches ? [], patchFlags ? "" }: { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; - version = "58.2"; - - # this patch should no longer be needed in 58.3 - # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14 - keywordFix = fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }; in stdenv.mkDerivation { name = pname + "-" + version; @@ -18,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; + inherit sha256; }; outputs = [ "out" "dev" ]; @@ -33,9 +25,7 @@ stdenv.mkDerivation { echo Source root reset to ''${sourceRoot} ''; - patchFlags = "-p4"; - - patches = [ keywordFix ]; + inherit patchFlags patches; preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 5edbf9e4551c..8206338fb080 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { name = "ign-transport-${version}"; inherit src; - buildInputs = [ cmake protobuf zeromq pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake protobuf zeromq utillinux # we need utillinux/e2fsprogs uuid/uuid.h ]; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 6fd204c236f7..0213148d6930 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; }; - buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ directfb libsigcxx libxml2 fontconfig ]; configureFlags = '' --enable-log-debug --enable-debug --enable-trace --with-examples diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 70ed2d00fead..2fbb2e3948ce 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.9"; + name = "jansson-2.10"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"; + sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 9fb2a2a2e3a1..82e02d06906b 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ javac jvm antlr gtk2 gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 9a5527b5a131..7d229d2577ab 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkgconfig zeromq3 jdk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zeromq3 jdk ]; preConfigure = '' ${if stdenv.system == "x86_64-darwin" then diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix new file mode 100644 index 000000000000..399d5914c2de --- /dev/null +++ b/pkgs/development/libraries/kdb/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql +}: + +mkDerivation rec { + pname = "kdb"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A database connectivity and creation framework for various database vendors"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 838affca77a3..5ce1b8ec13cc 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -14,8 +14,9 @@ in stdenv.mkDerivation rec { sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cfc8590c6390..f4158f7edbb4 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1jdcrfhvqffhc2h69197wkpc5j5synk5mm8rqhz27qfrfhh4vf0q"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome_common gtk_doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix new file mode 100644 index 000000000000..52b5d944b413 --- /dev/null +++ b/pkgs/development/libraries/kproperty/default.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons +}: + +mkDerivation rec { + pname = "kproperty"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ]; + + propagatedBuildInputs = [ qtbase ]; + + meta = with lib; { + description = "A property editing framework with editor widget similar to what is known from Qt Designer"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix new file mode 100644 index 000000000000..561e964c9610 --- /dev/null +++ b/pkgs/development/libraries/kreport/default.nix @@ -0,0 +1,27 @@ +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, + qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 +}: + +mkDerivation rec { + pname = "kreport"; + version = "3.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ]; + + meta = with lib; { + description = "A framework for creation and generation of reports in multiple formats"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index c80c28eb14bc..725bc714db28 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index d9578c380e6d..42d14d083354 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = '' diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 9cddbdd22d94..d5c232ae7767 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 icu languageMachines.ticcutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 0ba7e686e434..2ffabac1ede9 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index f1cb62e68020..738e53556ba6 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 # optional: zlib bzip2 libtar # broken but optional: boost diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 6a60996dc604..d12c970d4dc4 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index d8659c9a86b3..7a07e9f33a8a 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d60bca412720..5c12a2142cc1 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive icu libxml2 languageMachines.ticcutils languageMachines.libfolia diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 33037dbb87fa..56b6448d2533 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; - buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool autoconf-archive ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index a16a1f431a61..09001b6a6f08 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake autoreconfHook glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl pkgconfig python27Packages.six xmlsec zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 54196ae48ffe..4f2785675f08 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline tdb talloc tevent popt + python readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index bd740b757584..5791b0808b4a 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"; }; - buildInputs = [ pkgconfig glib zlib libpng cmake gnumake3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib zlib libpng cmake gnumake3 ]; configureFlags = "-v"; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 42abb3d297cb..71a28085541d 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - buildInputs = [ boost doxygen gperf pkgconfig librevenge libxml2 perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 745736559aba..900bcac41569 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 8b3522e2092e..81e32ab2c931 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; - buildInputs = [ pkgconfig glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus_glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d075efcd966..1f2349835d53 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -70,7 +70,8 @@ let ++ optional freetypeSupport "--enable-libfreetype" ; - buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lame yasm zlib bzip2 SDL ] ++ [ perl ] # for install-man target ++ optional mp3Support lame ++ optional speexSupport speex diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index ab8b507e98b2..726e9573d374 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libraw1394 ]; meta = { diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 1411474195d3..8948a74ad630 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c"; }; - buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 25be48026992..1b2cf4084f93 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap + libtool alsaLib libpulseaudio libvorbis gtk libcap /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? ]; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 4692cf6aac12..6838362c7942 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; - buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool m4 sqlite ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index 632ee9161351..a4b2e6078d2b 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 74c95704bbf0..f7596b9c702b 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 15c40b430401..e60f5e316bd0 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "09xsw9hfymzl9fi9r2r8n5cxk80fc00x9drsy1r59pgbycqxvf5q"; }; - buildInputs = [ cmake pkgconfig udev libcec_platform ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake udev libcec_platform ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 67302f330b9d..f6d6c5b803eb 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; }; - buildInputs = [ pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection ]; propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 6e0007111bc4..9ab42c7fd1dd 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc5.patch ]; - buildInputs = [ boost libxml2 pkgconfig curl autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost libxml2 curl ]; configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests"; # Cppcheck cannot find all the include files (use --check-config for details) diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 1e374b8ad1fd..3c900f86917e 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -12,8 +12,10 @@ let url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz"; sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gperf pkgconfig librevenge libxml2 boost icu cppunit zlib + gperf librevenge libxml2 boost icu cppunit zlib ]; # Boost 1.59 compatability fix @@ -24,7 +26,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs postPatch; + inherit nativeBuildInputs buildInputs postPatch; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index e5461d90dd98..8281036e7491 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; }; - buildInputs = [ cmake speexdsp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake speexdsp ]; meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index a34ff5edbe2d..7eb5df4c7ecb 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; - buildInputs = [pkgconfig libestr]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libestr]; meta = { homepage = http://www.libee.org/; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 4e74762f3f9d..6aca1d2be6d6 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; - buildInputs = [ libX11 libXi libXtst pkgconfig xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXi libXtst xextproto ]; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index d42425c8e185..851ee7f326b6 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk intltool pango vala_0_34 ] ++ optional (!extraOnly) menu-cache; configureFlags = [ (optional extraOnly "--with-extra-only") diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 291f20a5db2c..2e8fad3db827 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - buildInputs = [ pkgconfig libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc openssl ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; meta = with stdenv.lib; { description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 17cf93473d68..353c82aa1935 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s"; }; - buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with stdenv.lib; [ cmake confuse ] ++ optionals cppSupport [ boost ] ++ optionals pythonSupport [ python swig ] ++ optionals docSupport [ doxygen ]; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index fd6e4a7aa482..4adb7e535789 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; }; - buildInputs = [ autoconf automake libsndfile libtool pkgconfig libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libsndfile libtool libuuid ]; preConfigure = "make -f Makefile.cvs"; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 93ad88f0021a..1da6cffe3f2c 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk"; }; - buildInputs = [ pkgconfig zlib bzip2 libmcrypt libmhash ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib bzip2 libmcrypt libmhash ]; meta = with stdenv.lib; { description = "A small library to encapsulate data in an encrypted structure"; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 5b29c23fa6e5..ef2a44bf183a 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; }; - buildInputs = [ pkgconfig udev glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. configureFlags = [ "--disable-umockdev" ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 73424902cd09..bfdd0cf8fd74 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl + makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index e3e4e0007730..521fe00b56d7 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3"; + sha256 = "1w6jycr5bbawimhb72wxf9ic92yrhfadahfj0b70myw5n81nnjv4"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 2cba1b0dd3ce..2ad59e698d0b 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libraw1394 ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index b55e0104f706..835c7d6f2262 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; - buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss libintlOrEmpty ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 6f833ec81a92..267d3097c997 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]; preBuild = '' diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index d539c61a4c95..2167b4477034 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; - buildInputs = [ cmake qt4 pkgconfig gsasl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 gsasl ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index efe93ec02dfc..73d996c5ec86 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "liblastfm-SF-0.5"; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl openssl ]; diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index aa75acb7d6d3..4667a6e76014 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; }; - buildInputs = [ pkgconfig systemd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd ]; configureFlags = [ "--enable-rfc3195" diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index e505871eb02e..4b445c93175f 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index a1cbf9250c49..c89b21de0d64 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi"; }; - buildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool ]; preConfigure = "make -f Makefile.svn"; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 92902cd27d79..1c8e65dafd4b 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib udev libgudev python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib udev libgudev python ]; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/software/libmbim/; diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix index 23f333562dc5..a457adfed80f 100644 --- a/pkgs/development/libraries/libmcs/default.nix +++ b/pkgs/development/libraries/libmcs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74"; }; - buildInputs = [ pkgconfig libmowgli ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmowgli ]; meta = { description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 9dae423efd78..1becd0ee8ef6 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; }; - buildInputs = [ autoreconfHook openssl expat libtool pkgconfig check ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index ec03032105fb..68156c0c2171 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "devdoc" "info" ]; - buildInputs = [ libgcrypt curl gnutls pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgcrypt curl gnutls ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ]; preCheck = '' diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 4cbc51ea6786..343622e8d5c7 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ glib ]; postPatch = '' diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index 865330fdda7c..b0adcf237549 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl libnxml ]; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 8892b016fe88..9cac26bf2be1 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; propagatedBuildInputs = [ libusb1 ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 4765e90c6df7..f197d5bcef98 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { version = "5.1.0"; name = "libmusicbrainz-${version}"; - buildInputs = [ cmake neon libdiscid libxml2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake neon libdiscid libxml2 ]; src = fetchFromGitHub { owner = "metabrainz"; diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index b833945d5119..e1ac659683c9 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -9,13 +9,15 @@ let url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz"; sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib libwpg libwpd librevenge + boost cppunit zlib libwpg libwpd librevenge ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 49760f7fc530..897a769b014d 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig automake autoconf libtool + automake autoconf libtool intltool gobjectIntrospection glib gtk2 gtk_doc clutter clutter_gtk diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 973198409758..fa94fa549e42 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; meta = { description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure"; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 2920cbd97858..f30e12a41631 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; meta = { description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure"; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index fa4a0f11ef4c..5de9409b729f 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143"; }; - buildInputs = [ pkgconfig libmnl libnfnetlink ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl libnfnetlink ]; meta = { homepage = http://www.netfilter.org/projects/libnetfilter_queue/; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index fdbc2ac88003..4903d54b4a31 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; }; - buildInputs = [ pkgconfig dbus expat ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus expat ]; meta = { description = "A small library for C application development"; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 41a9cf518e4c..fbde49a54d08 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # disable tests as we don't need to depend on gtk+(2/3) configureFlags = [ "--disable-tests" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ]; + buildInputs = [ glib gdk_pixbuf ]; meta = { homepage = https://developer.gnome.org/notification-spec/; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 341ef3723516..8a3e22ef31f7 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -9,13 +9,14 @@ let url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz"; sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib libwpg libwpd librevenge + boost cppunit zlib libwpg libwpd librevenge ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 7927dba89838..77c049949564 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - buildInputs = [ opensp pkgconfig libxml2 curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ opensp libxml2 curl ]; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index ed46919f26ce..f6fe9ecd03a0 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libogg ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = https://xiph.org/oggz/; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index b0b22aa18e78..db534d20c89c 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig intltool gobjectIntrospection libsoup libxslt check vala_0_23 + intltool gobjectIntrospection libsoup libxslt check vala_0_23 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index ba7a0af0bf54..9be217a800d3 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 1c88167078f9..6d7606428f69 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; - buildInputs = [ pkgconfig libsigcxx ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsigcxx ]; patches = [ ./libpar2-0.4-external-verification.patch ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 34e9bb12754d..c04c8d724d0b 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 9eb3d345ecb7..b19008449abe 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; }; - buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2 + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost python2 libgsf bzip2 xmlto gettext imagemagick doxygen ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 2e316a30a018..afa8a0451ac0 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib python libgudev libmbim ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python libgudev libmbim ]; configureFlags = ["--enable-mbim-qmux" ]; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index a5e4c4410c09..337d9423aa3d 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"; }; - buildInputs = [ autoconf automake pkgconfig libtool SDL2 libpng ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool SDL2 libpng ]; propagatedBuildInputs = [ SDL2 libpng ]; diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 945e11d1bcef..8f8a54337f24 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preAutoreconf = "rm m4/*"; postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c"; - buildInputs = [ pkgconfig autoreconfHook ladspaH openssl zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ladspaH openssl zlib ]; propagatedBuildInputs = [ librdf_raptor2 ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index dce85331c1be..adc00b56a287 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; }; - buildInputs = [ pkgconfig gnutls zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnutls zlib ]; meta = with stdenv.lib; { homepage = http://www.librelp.com/; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index cb61982da091..c74a7981458d 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1k6c0hmyzxh8459r790slh9vv9vwy9d7w3nlmrqypbx9mk855hgy"; }; - buildInputs = [ pkgconfig autoreconfHook readline texinfo ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; configureFlags = [ diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index ac5feb1ddc8d..3523eb5c37bc 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -9,13 +9,14 @@ let url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost pkgconfig cppunit zlib + boost cppunit zlib ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index 756a53d5ee55..bc39a077e0c4 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; - buildInputs = [ pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; meta = with stdenv.lib; { description = "Implementation of the VISA standard (for instrument control)"; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix new file mode 100644 index 000000000000..a8877bdb2da9 --- /dev/null +++ b/pkgs/development/libraries/librime/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, + libyamlcpp, gmock }: + +stdenv.mkDerivation rec { + name = "librime-${version}"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "librime"; + rev = "rime-${version}"; + sha256 = "14jgnfm61ynm086x9v7wfmv2p14h0qp8lq4d2jqm21n821jsraj6"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://rime.im/; + description = "Rime Input Method Engine, the core library"; + license = licenses.bsd3; + maintainers = with maintainers; [ sifmelcara ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 447712fc7db8..7845f28adc91 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/Makefile sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \ -i gdk-pixbuf-loader/Makefile + + # Fix thumbnailer path + sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk_pixbuf}/bin\1#g" \ + -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; # Merge gdkpixbuf and librsvg loaders diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 0457c0eb9c49..3898071c8582 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec patches = [ ./libsearpc.pc.patch ]; - buildInputs = [ automake autoconf pkgconfig libtool python2Packages.python python2Packages.simplejson ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index ab10e34e2301..812847ea123b 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 842471a263d9..9fc6ff86773b 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; - buildInputs = [pkgconfig m4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ m4]; meta = { homepage = http://libsigc.sourceforge.net/; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 21710375ed74..53d927219e21 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig flac libogg libvorbis ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ flac libogg libvorbis ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 4fc1a5d27898..5d4535676e7b 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.13"; + name = "libsodium-1.0.15"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww"; + sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index d5e72cae5fce..19ccc9159a3e 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; }; - buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos libiconv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; configureFlags = "--disable-freexl"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 951a939cbfbf..3a01ff2944db 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -63,7 +63,8 @@ else stdenv.mkDerivation { '' else stdenv.mkDerivation { name = "libspotify-samples-${version}"; src = libspotify.src; - buildInputs = [ pkgconfig libspotify readline ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libspotify readline ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; patchPhase = "cp ${apiKey} appkey.c"; diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 76aa014392b0..0d014cb22a82 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml"; }; - buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf openssl expat libtool check ]; dontDisableStatic = true; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index b1dfa5ba7e4d..2671199ab0e0 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cmake perl ]; meta = { diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 212a3a23939b..992bad020ea6 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "C library for manipulating POSIX tar files"; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 97bc98b22d88..429cc5d9f180 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - buildInputs = [ libtool pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool ncurses ]; meta = with lib; { description = "Terminal keypress reading library"; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index deab30430359..3a67e1267e20 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; - buildInputs = [ libkate pango cairo pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libkate pango cairo ]; meta = { homepage = http://code.google.com/p/libtiger/; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index d0b69e0348fc..351ec3e77331 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [automake autoconf libtool ]; - - buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ]; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boost openssl zlib python libiconv geoip ]; preConfigure = "./autotool.sh"; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index bac29bc0ca8d..58b052b8fae8 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 170af8f172eb..82aba6b89f5a 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - buildInputs = [ autoreconfHook mesa ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ mesa ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 654bdd2e61f9..387dbb22a816 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"; }; - buildInputs = [ autoreconfHook mesa ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ mesa ]; meta = { description = "A patent-free S3TC compatible implementation"; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix new file mode 100644 index 000000000000..71ac22e85a8f --- /dev/null +++ b/pkgs/development/libraries/libubox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: + +stdenv.mkDerivation { + name = "libubox-2017-09-29"; + + src = fetchgit { + url = "https://git.openwrt.org/project/libubox.git"; + rev = "632688e8d6cde32781e4ec685d59afb0938300ad"; + sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c"; + }; + + cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ json_c ]; + + meta = with lib; { + description = "C utility functions for OpenWrt"; + homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 4db641868508..2f8963db0cd8 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -13,7 +13,8 @@ in sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; }; - buildInputs = [ cmake pkgconfig ] ++ + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ] ++ (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 8d1077ee6a00..b0066fa75f22 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58"; }; - buildInputs = [ pkgconfig dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index ebf81c67be05..a5adaa9ac179 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ]; - buildInputs = [ pkgconfig glib gtk2 dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 dbus_glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 5a76a93b8e3d..dd2f1edc5f2a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 79863f40dffb..ceb42fe2bfc3 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ dri2proto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 90c1f07da5ae..6ca3d997e659 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [pkgconfig glib ncurses gpm]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 8cebaeee2afd..e41ab5fe5a33 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -13,8 +13,9 @@ in stdenv.mkDerivation rec { sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt + libvirt glib libxml2 intltool libtool yajl nettle libgcrypt python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 50a4c7c8f247..8bac0f41ddeb 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index e58d964a6253..472539ea24bb 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ pkgconfig glib ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 5683e88b0205..eed0c77af804 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; }; - buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; patches = [ ./CVE-2006-3376.patch ./CVE-2009-1364.patch diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 094edc36bbbf..ed775fb45932 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { patches = [ ./install_introspection_to_prefix.patch ]; - buildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool ]; propagatedBuildInputs = [ libX11 gtk3 ]; meta = { diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 6e0809664cff..254541374104 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig gtk2 intltool xorg.libX11 xorg.libXres ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index b165631e23eb..73fe5b55ab45 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0v1a0hj96i4jhb5833336s4zcslzb6md5cnmnrvgywx8cmw40c0c"; }; - buildInputs = [ boost pkgconfig librevenge zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost librevenge zlib ]; meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch index 0d41cd737f01..286057c4ba87 100644 --- a/pkgs/development/libraries/libx86/non-x86.patch +++ b/pkgs/development/libraries/libx86/non-x86.patch @@ -5,7 +5,7 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile ifeq ($(BACKEND),x86emu) OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o -+ CFLAGS += -DX86EMU ++ CFLAGS += -DX86EMU -fno-delete-null-pointer-checks else OBJECTS += lrmi.o endif diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index a8a6200519ee..f0e63efc0d14 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,16 +1,24 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { - name = "libxdg-basedir-1.0.2"; + name = "libxdg-basedir-1.2.0"; src = fetchurl { - url = "http://n.ethz.ch/student/nevillm/download/libxdg-basedir/${name}.tar.gz"; - sha256 = "0fibbzba228gdk05lfi8cgfrsp80a2gnjbwka0pzpkig0fz8pp9i"; + url = "https://nevill.ch/libxdg-basedir/downloads/${name}.tar.gz"; + sha256 = "2757a949618742d80ac59ee2f0d946adc6e71576406cdf798e6ced507708cdf4"; }; - meta = { - homepage = http://n.ethz.ch/student/nevillm/download/libxdg-basedir/; + patches = [ + # Overflow bug + (fetchpatch { + url = "https://github.com/devnev/libxdg-basedir/commit/14e000f696ef8b83264b0ca4407669bdb365fb23.patch"; + sha256 = "0lpy1ijir0x0hhb0fz0w5vxy1wl1cw9kkd6gva0rkp41i6vrp2wq"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/devnev/libxdg-basedir; description = "Implementation of the XDG Base Directory specification"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 486d52a2e27b..fd61ae840284 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ yacc flex xkeyboard_config libxcb ]; configureFlags = [ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 775b515dc7f0..762d23e240a2 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl libidn glib zlib ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "A lightweight C library for the Jabber protocol"; diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix index 38dfba4c462c..1e4cf11d1fa0 100644 --- a/pkgs/development/libraries/luaffi/default.nix +++ b/pkgs/development/libraries/luaffi/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac"; }; - buildInputs = [ lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lua ]; patches = [ ./makefile-errors.patch diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 03a940801e98..0a64c7c0429a 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libetpan cmake icu cyrus_sasl libctemplate libuchardet pkgconfig glib + libetpan cmake icu cyrus_sasl libctemplate libuchardet glib libtidy libxml2 libuuid openssl ]; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix new file mode 100644 index 000000000000..5f050c6e7a73 --- /dev/null +++ b/pkgs/development/libraries/marisa/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "marisa-${version}"; + version = "0.2.4"; + + src = fetchurl { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-${version}.tar.gz"; + sha256 = "1cwzf8hr348zihkiy0qckx0n6rxg7sy113xhbslb1irw1pvs99v7"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/marisa-trie/; + description = "Static and space-efficient trie data structure library"; + license = licenses.bsd3; + maintainers = with maintainers; [ sifmelcara ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 47b7029927cf..f49b7ba2c4b4 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; }; - buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + buildInputs = [ mediastreamer openh264 ]; meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 06d9994a529d..9a6441956db3 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { echo 'Cflags: -I''${includedir}' >> glu.pc.in ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa_noglu ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2d253f7cd45c..96d226785cab 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -140,14 +140,14 @@ stdenv.mkDerivation { "--disable-opencl" ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ]; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - autoreconfHook intltool expat llvmPackages.llvm + expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland libvdpau libelf libXvMC diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index 12b15c4937d7..444ec9dac2be 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; }; - buildInputs = [ pkgconfig which mono ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which mono ]; dontStrip = true; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index a344b8fa92f4..d85d4f444077 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ eigen epoxy ]; - buildInputs = [ SDL fftw gtest pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL fftw gtest ]; meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 852946e7e40f..4e4ddfb63899 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; }; - buildInputs = [ autoreconfHook sqlite ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ sqlite ]; meta = { description = "A flexible memory management and garbage collection library"; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 6e4b3e6a862a..715d2cb90f47 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost pkgconfig (if withOgre then ogre else mesa) ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else mesa) ]; # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 8df9715a4f4a..ee7d4765fb22 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1"; sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4"; }; - buildInputs = [ openssl doxygen boost sqlite cryptopp pkgconfig python pythonPackages.sphinx]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx]; preConfigure = '' patchShebangs waf ./waf configure \ diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 9f46305c1b54..e0adb312677c 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - buildInputs = [ autoconf automake libtool pkgconfig glib readline makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index fbd0c053f047..e393d50bf9d2 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - buildInputs = [libxml2 pkgconfig openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index e0156be5da52..2351e3b0800b 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - buildInputs = [libxml2 pkgconfig openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libxml2 openssl] ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index c2aea07d102c..8f7bebf649c9 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.15"; in +let version = "4.16"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97"; + sha256 = "1l9wlnb9y0bzicv448jjl9kssqn044dc2qrkwzp4ll35fvch4ccv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 80975c8ef5dc..c88cfb8826ec 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.31"; + version = "3.32.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz"; - sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9"; + url = "mirror://mozilla/security/nss/releases/NSS_3_32_1_RTM/src/${name}.tar.gz"; + sha256 = "0lj6c94102aa81bnjisnix09zfjly9aa1d6vrzxmcjmzynkrrrad"; }; buildInputs = [ perl zlib sqlite ]; @@ -25,37 +25,13 @@ in stdenv.mkDerivation rec { ''; patches = - [ # Install a nss.pc (pkgconfig) file and nss-config script - # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 - (fetchurl { - name = "nss-3.28-gentoo-fixups.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/" - + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch" - + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6"; - sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q"; - }) + [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; patchFlags = "-p0"; - postPatch = '' - # Fix up the patch from Gentoo. - sed -i \ - -e "/^PREFIX =/s|= /usr|= $out|" \ - -e '/@libdir@/s|gentoo/nss|lib|' \ - -e '/ln -sf/d' \ - nss/config/Makefile - - # Note for spacing/tab nazis: The TAB characters are intentional! - cat >> nss/config/Makefile <<INSTALL_TARGET - install: - mkdir -p \$(DIST)/lib/pkgconfig - cp nss.pc \$(DIST)/lib/pkgconfig - INSTALL_TARGET - ''; - outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; @@ -79,9 +55,31 @@ in stdenv.mkDerivation rec { mv $out/*.OBJ/* $out/ rmdir $out/*.OBJ - cp -av config/nss-config $out/bin/nss-config - ln -s lib $out/lib64 + + # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 + # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a + NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'` + NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'` + NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'` + PREFIX="$out" + + mkdir -p $out/lib/pkgconfig + sed -e "s,%prefix%,$PREFIX," \ + -e "s,%exec_prefix%,$PREFIX," \ + -e "s,%libdir%,$PREFIX/lib64," \ + -e "s,%includedir%,$PREFIX/include/nss," \ + -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \ + -e "s,%NSPR_VERSION%,4.16,g" \ + pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc + chmod 0644 $out/lib/pkgconfig/nss.pc + + sed -e "s,@prefix@,$PREFIX," \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \ + -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \ + -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ + pkg/pkg-config/nss-config.in > $out/bin/nss-config + chmod 0755 $out/bin/nss-config ''; postFixup = '' diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 8f3a313b21df..9051d96eff79 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index 80e683a32aea..d26b15176aa6 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + python readline gettext libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index eccfccbaf042..b82f137ec6d7 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + prePatch = stdenv.lib.optional stdenv.isDarwin '' + substituteInPlace cmake/dist.cmake \ + --replace '@executable_path/''${UP_DIR}/''${INSTALL_LIB}' $out'/''${INSTALL_LIB}' + ''; + meta = { homepage = https://github.com/kkos/oniguruma; description = "Regular expressions library"; diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 36a4c3b0bb67..f86e4d120976 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; }; - buildInputs = [ pkgconfig ptlib srtp libtheora speex + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; propagatedBuildInputs = [ speex ]; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 160599837c55..5ce30b039696 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ]; propagatedBuildInputs = [ libxml2 pcre ]; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index aafdd60e415f..5eb08ecd6014 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - buildInputs = [ autoreconfHook pkgconfig pcsclite libusb doxygen libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ pcsclite libusb doxygen libxslt ]; preInstall = '' mkdir -p $out/etc diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 22cc5b416e7d..27a9860c8683 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { ./bootstrap ''; - buildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 0eb940c119ea..b179ca8803c1 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4"; }; - buildInputs = [ autoconf automake libtool pkgconfig libxml2 curl cmake pam sblim-sfcc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ]; cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index eb3c12023678..8154fca29e84 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; }; - buildInputs = [ pkgconfig glib pango libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib pango libX11 ]; meta = { description = "A compatibility library for pango>1.30.*"; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 38f1496062e6..aae6ed0f688a 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib pango ]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9762e284e68..6b8ba68adb76 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index f59c538856ca..9d7d7552cfc7 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1"; }; - buildInputs = [ pkgconfig openssl autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index bc37cfb3d184..f892540ae5c1 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sphinxbase ]; - buildInputs = [ pkgconfig python27 swig2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python27 swig2 ]; meta = { description = "Voice recognition library written in C"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 804bca5f8a5e..aef627f8f1fe 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook ] + [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ] + [ glib expat pam spidermonkey_17 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; # Ugly hack to overwrite hardcoded directories diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 41f29a1a6b19..c55d17113219 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; - buildInputs = [ pkgconfig libjack2 ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = [ "--disable-mac-universal" ]; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index b3249aae9b17..5f0006c05894 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - buildInputs = [ autoreconfHook zlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index b7c456df85c4..06154e0008ba 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - buildInputs = [ autoreconfHook zlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; # The generated C++ code uses static initializers which mutate a global data # structure. This causes problems for an executable when: diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 3a03d5c8b4b2..b9ad506e20a8 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { inherit src; - buildInputs = [ autoreconfHook pkgconfig protobuf zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { homepage = http://github.com/protobuf-c/protobuf-c/; diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ecea72d2e8f8..c5d3d7411309 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=gnu++98"; - buildInputs = [ pkgconfig bison flex unixODBC openssl openldap + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison flex unixODBC openssl openldap cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix index 7c1cc5da07e3..20e6e364799f 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix @@ -5,8 +5,9 @@ qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio + alsaLib gstreamer gst-plugins-base libpulseaudio ]; qmakeFlags = [ "GST_VERSION=1.0" ]; } diff --git a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix index e133256e9004..4fe9c90232a2 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix @@ -8,7 +8,8 @@ with stdenv.lib; qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gstreamer gst-plugins-base libpulseaudio] ++ optional (stdenv.isLinux) alsaLib; outputs = [ "out" "dev" "bin" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 1bd7305867dd..ff017279dc64 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; }; - buildInputs = [ zlib perl pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib perl python ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index bb709e952f8b..5629164f160a 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - buildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ librep gtk2 ]; patchPhase = '' diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index b0707ad15f06..364a4d4794a8 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z"; }; - buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ]; meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 5a08e32e7e98..b3c6d9f26d47 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, zlib, bzip2, lzma, curl }: +{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "${major}.0"; pname = "htslib"; - major = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; - sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0"; + url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; + sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; }; + # perl is only used during the check phase. + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 lzma curl ]; configureFlags = "--enable-libcurl"; # optional but strongly recommended installFlags = "prefix=$(out)"; + preCheck = '' + patchShebangs test/ + ''; + + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; @@ -25,4 +35,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mimadrid ]; }; } - diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 0023427f1bab..968550675235 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73"; }; - buildInputs = [ pcre pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre python ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index f15c72498b25..219cda38bc28 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; }; - buildInputs = [ boost fcgi openssl opensaml-cpp log4shib pkgconfig xercesc xml-security-c xml-tooling-c ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix new file mode 100644 index 000000000000..9d0aca0ab14b --- /dev/null +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: + +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "silgraphite-2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; + sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype libXft pango fontconfig]; + + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; + + meta = { + description = "An advanced font engine"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index a399db1b71f8..a5dc1f41e984 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7"; }; - buildInputs = [ pkgconfig freetype cmake ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype cmake ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 9bae9feb693e..17195febe133 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 01ea4c4a1626..57f81aa4613e 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; - buildInputs = [ pkgconfig python serd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python serd ]; configurePhase = "${python.interpreter} waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 6f7d154bbe83..ff461f1b8e64 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; - buildInputs = [ pkgconfig sqlite expat zlib proj geos libspatialite readosm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; configureFlags = "--disable-freexl"; diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index e82b2fe045b3..57c3ae40fd97 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation (rec { sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - buildInputs = [ swig2 python27 pkgconfig bison ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ swig2 python27 bison ]; meta = { description = "Support Library for Pocketsphinx"; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 27194aabd1bb..d4ea531f886e 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # libsrtp.pc references -lcrypto -lpcap without -L propagatedBuildInputs = [ openssl libpcap ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index b4b29b54881e..ce4fca6da70d 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - buildInputs = [ libX11 libxcb pkgconfig xcbutil ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxcb xcbutil ]; meta = { homepage = http://www.freedesktop.org/software/startup-notification; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index e4a767579ab7..35bacff0525a 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; - buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ check cppunit perl pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index ddb880e6bf27..f1ae1ea5db0e 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; - buildInputs = [ pkgconfig nss nspr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nss nspr ]; meta = with stdenv.lib; { description = "Secure PIN handling using NSS crypto"; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 44f6cabd35a7..13497f7727f4 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; - buildInputs = [ pkgconfig icu clucene_core curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ icu clucene_core curl ]; prePatch = '' patchShebangs .; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 125e6b389e33..1e7448b66050 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42 + python readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index f7449dcf1ab9..7ccd98856f62 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42 + python readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index bc9e861df9c6..ec26c9f567b5 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - buildInputs = [pkgconfig libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2856f025a888..2982d33e9962 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python pkgconfig readline talloc libxslt docbook_xsl docbook_xml_dtd_42 + python readline talloc libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 4b299eedbd98..55855d05d16e 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost zlib libevent openssl python pkgconfig bison flex twisted + boost zlib libevent openssl python bison flex twisted ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 2258f28b9c48..843c6157479e 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { "--with-tcl=${tcl}/lib" ]; - buildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin fontconfig; propagatedBuildInputs = [ tcl libXft ]; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 54ba8470fc5b..a65254fea24e 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.twolame.org/; license = with licenses; [ lgpl2Plus ]; - platforms = with platforms; [ unix ]; + platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 315566851fb5..8665be26925e 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # disable flaky networking test postPatch = '' diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 94223378151b..26c040721bdf 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - buildInputs = [ autoconf gtk_doc automake libtool pkgconfig glib libsoup gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index cf34c96a2fef..4742e2170131 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - buildInputs = [ libtool pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool ]; meta = with lib; { description = "A very basic terminfo library"; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index f4ec02422242..e4e053805af7 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; - buildInputs = [ pkgconfig libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb ]; propagatedBuildInputs = [ libusb ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index c7b8ddd8d6f0..4522ecc1bb63 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs"; }) ]; - buildInputs = [ libvdpau mesa libva pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvdpau mesa libva ]; preConfigure = '' patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 1a1e70d89bc7..2fa6710c4faf 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook + autoreconfHook yasm vapoursynth fftwFloat ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index f62279786c66..8330f7f44f33 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ cmake git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 094c3596d4b7..d69993534146 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -83,14 +83,14 @@ stdenv.mkDerivation rec { + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite + cmake perl python2 ruby bison gperf pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty ++ [ gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index be661d0d270a..5d4caed890a8 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake boost pkgconfig doxygen qt48Full libharu + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost doxygen qt48Full libharu pango fcgi firebird libmysql postgresql graphicsmagick glew openssl pcre ]; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 7ab6041e86dd..bbbf9af29e58 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "--disable-static" ]; - buildInputs = [ xalanc xercesc openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xalanc xercesc openssl ]; meta = { homepage = http://santuario.apache.org/; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index c55a3020b442..32ce856eddd3 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + + buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 252bcd02faff..e759e65dfc6b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib sqlite gnome3.gnome_common intltool libtool dbus_libs telepathy_glib vala_0_23 dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 961220bb7831..2c9d27a8b6ad 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "11pk8a5manr751jhy0xrql57jzab57lwqjxbpd8kvm9m8b51icwq"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 38ecfcdf9a90..091d1adfefbc 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; postPatch = '' # very ugly way of replacing the adb calls diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix new file mode 100644 index 000000000000..d2d3159cde14 --- /dev/null +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format}: +let + pname = "biniou"; + version = "1.0.9"; + webpage = "http://mjambon.com/${pname}.html"; +in + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; + +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; + }; + + buildInputs = [ ocaml findlib easy-format ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = with stdenv.lib; { + description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + homepage = "${webpage}"; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index d2d3159cde14..7047edf24b3e 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,36 +1,26 @@ -{stdenv, fetchurl, ocaml, findlib, easy-format}: -let - pname = "biniou"; - version = "1.0.9"; - webpage = "http://mjambon.com/${pname}.html"; -in - -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; - }; - - buildInputs = [ ocaml findlib easy-format ]; - - createFindlibDestdir = true; - - makeFlags = "PREFIX=$(out)"; - - preBuild = '' - mkdir $out/bin - ''; - - meta = with stdenv.lib; { - description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - homepage = "${webpage}"; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ easy-format ]; + + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 24a67a38f3c3..b419971921ba 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -11,7 +11,8 @@ buildOcaml rec { sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; }; - buildInputs = [ ncurses pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ libffi ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 63e256b60958..42afec7e439d 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, + js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, + ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, ppx_deriving, findlib , ocamlbuild }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; + calendar cryptokit ocamlnet react ssl ocaml_pcre ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 635572ea9c8f..4f586f2f99e0 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - buildInputs = [ ocaml pkgconfig fontconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml fontconfig ]; makeFlags = "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/ OCAML_HAVE_OCAMLOPT=yes"; meta = { diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 0f1facd65186..1d5aabf30046 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ''; - buildInputs = [ocaml findlib pkgconfig gdome2 libxslt]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib gdome2 libxslt]; propagatedBuildInputs = [gdome2]; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 68019113f388..9e6013b9083f 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02"; -stdenv.mkDerivation { - name = "ocaml-lablgtk-extras-1.5"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1453/lablgtkextras-1.5.tar.gz; - sha256 = "1bgflgadmy2nqnqjf34zja0jy6f9wpqq8x22qcfilj9g8c9wkrmi"; +stdenv.mkDerivation rec { + version = "1.6"; + name = "ocaml${ocaml.version}-lablgtk-extras-${version}"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "lablgtk-extras"; + rev = "release-${version}"; + sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; buildInputs = [ ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 2aa0842c55f7..5dc303b59f48 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 67f579eb4698..d6e56126018c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; }; - buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 58e93b4f8374..b5bcb0de1ee6 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rgrpgwrgphw106l1xawxir002b7rmzc23rcxhv8ib6rymp1divx"; }; - buildInputs = [pkgconfig ocaml findlib gmetadom gtkmathview lablgtk]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib gmetadom gtkmathview lablgtk]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index f8e79d566d44..c0532ff03259 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild lwt react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index fc721dc4c9a3..c3acdcf5bdb4 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -26,11 +26,12 @@ buildOcaml rec { inherit sha256; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml_oasis which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] - ++ optionals [ ocaml_react ocaml_ssl ] + ++ optionals [ react ssl ] ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 022a60dcc66f..4d505b23ae0e 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ lwt ocaml_react ]; + propagatedBuildInputs = [ lwt react ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 80ae140a3fc4..165dda1fa027 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml automake gnum4 autoconf unzip findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index a4e4bf8674fe..d9cab2a759da 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; }; - buildInputs = [ ocaml findlib ocamlbuild pkgconfig cairo ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild cairo ] ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 3610cded1c94..108a2c30f2dd 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "let-def"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "0xwjll827anqngnqy746m2pd44mkhsaaqaqbir6z91xcqix2isvy"; + sha256 = "1wj66nb16zijacpfrcm7yi0hlg315v71nxri3ia7r0sa3mlzxl34"; }; buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 51a30d7c91a2..9944cf821c50 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; }; - buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index a5fd2d5076da..e8441cf6937c 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 4ce3ac6dff30..eb25982a69b3 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; }; - buildInputs = [ autoreconfHook ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index c8e60015d013..081f9edbecf9 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 , camlzip, pgocaml @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt + buildInputs = [ocaml which findlib react ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index 6e9ca15fb382..2d697a285fd3 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }: stdenv.mkDerivation rec { version = "0.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; - propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ]; + propagatedBuildInputs = [ js_of_ocaml lwt3 react ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 83732eb1f75f..899806c4dae2 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -2,13 +2,23 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "20171003"; + sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx"; + } else { + version = "20140424"; + sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; +}; in + stdenv.mkDerivation { - name = "ocaml-pprint-20140424"; + name = "ocaml${ocaml.version}-pprint-${param.version}"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz; - sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; + url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 2dffbcf440f9..5a720aead806 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,29 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, opam }: stdenv.mkDerivation { - name = "ocaml-react-1.2.0"; + name = "ocaml-react-1.2.1"; src = fetchurl { - url = http://erratique.ch/software/react/releases/react-1.2.0.tbz; - sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8"; + url = http://erratique.ch/software/react/releases/react-1.2.1.tbz; + sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib topkg ocamlbuild opam ]; createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in - '' - opam-installer --script --prefix=$out react.install > install.sh - sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh - sh install.sh - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = http://erratique.ch/software/react; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 828a3fb60683..1f1781f5a65b 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }: assert stdenv.lib.versionAtLeast ocaml.version "3.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ocaml_react]; + propagatedBuildInputs = [ react ]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index cfa90226678a..38e1b3c7467d 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ ocaml findlib ocamlbuild pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 81b8c28b4524..3886af37512f 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchzip { - url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz"; - sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm"; + url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; + sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3"; }; buildInputs = [which ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix new file mode 100644 index 000000000000..42771d1e35f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-stdint-${version}"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "andrenth"; + repo = "ocaml-stdint"; + rev = version; + sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + createFindlibDestdir = true; + + meta = { + description = "Various signed and unsigned integers for OCaml"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.gebner ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 01fa5b7ba6ab..1b90a539ac8c 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg result pkgconfig opam ocb-stubblr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result opam ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index d94a3eac873a..7f5bcb03ad6c 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -6,22 +6,37 @@ in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "1.3.0"; + sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n"; + buildInputs = [ topkg ]; + inherit (topkg) buildPhase; + } else { + version = "1.2.0"; + sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + buildInputs = []; + buildPhase = "./pkg/build true"; + }; +in + stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "1.2.0"; + inherit (param) version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ] ++ param.buildInputs; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + inherit (param) buildPhase; installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 2cb4fdcd3014..5dc6a9056ada 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { inherit (param) url sha256; }; - buildInputs = [ ocaml findlib pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; patchPhase = "patchShebangs ./z_pp.pl"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 410d5c0c612b..72ff8e4c0497 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; + buildInputs = [ ocaml findlib ocamlbuild react ]; propagatedBuildInputs = [ camomile ]; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 7e80acb97c47..74fa75e7aa56 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html # # (stack protection is disabled above for gcc 4.8 compatibility.) - buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 7b14b20dc83d..2cdab404c5fe 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index e22e1fae2202..f94ee8d7637f 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure avahi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 6d41f2c5e6a6..846fb7e37306 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 68a083343752..54f99bf8afc9 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; - buildInputs = [ pkgconfig pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; meta = { diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index f1bc49c5eccc..ebd13743442d 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure fcgi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 7f5c4801d5d1..74ec8e49343b 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure faust libtool ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index a9a3a56ebb87..efea0b4182c2 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libffi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 9bb65d042b96..e8c1a948fe92 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); - buildInputs = [ pkgconfig hsEnv pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ hsEnv pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; meta = { diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index eb1c01e4eeff..e3c7e6bc14a6 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index e110afa1d249..d1657cdd445d 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gnuplot ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 10eddeeb7971..08aa674eb6bb 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index fd2460b5c1bd..77fae1d0981c 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index a68d04f901f4..2dd0865f6ea1 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure liblo ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 4f2d5abba1ef..7f3638fe5c9c 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 63a8cafc474f..98556acbf281 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lv2 ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index bbf20b66c295..950c536e7606 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portmidi ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index ccc32739a49d..63196fadf468 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 666cf55044d0..4ae1e58a7bca 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libiodbc ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index b51f2ff5e87a..d5b0a7dbde59 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; - buildInputs = [ pkgconfig pure ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; preInstall = '' diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 42ead62b2569..20d61e5c3626 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index e93207943b06..a6bb2ed61672 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure readline ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 522446104ffc..235478a1776a 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index f937b9eb5300..91ff3a446c2b 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure sqlite ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 4ade515faa88..8c39b9791e02 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 02c96d975ec4..dd7a945182ba 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 0fe1667b0406..03e322d74c0c 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index ed08cdf52096..8e2686110356 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 22f3579bae3f..0513f67e5697 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -30,10 +30,12 @@ buildPythonPackage rec { tests/run/cpdef_enums.pyx ''; - buildInputs = [ glibcLocales pkgconfig gdb ]; - # For testing - nativeBuildInputs = [ numpy ncurses ]; - + nativeBuildInputs = [ + pkgconfig + # For testing + numpy ncurses + ]; + buildInputs = [ glibcLocales gdb ]; LC_ALL = "en_US.UTF-8"; # cython's testsuite is not working very well with libc++ @@ -54,4 +56,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 43c176a09ec6..a1ae95e6d5d5 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.7"; + version = "0.12.9"; src = fetchPypi { inherit pname version; - sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg"; }; disabled = isPyPy; @@ -79,4 +79,4 @@ buildPythonPackage rec { homepage = "http://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 1d41e3fbafde..0cb817844c77 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -18,7 +18,7 @@ let # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { - url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py"; + url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py"; sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; }; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index ab6e70a9a642..c8f122098da8 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -14,7 +14,8 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; - buildInputs = [ pkgconfig dbus dbus_glib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus dbus_glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix new file mode 100644 index 000000000000..971d53e3dddd --- /dev/null +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -0,0 +1,26 @@ +{ stdenv, pythonPackages }: + +with pythonPackages;buildPythonPackage rec { + pname = "devpi-common"; + version = "3.2.0rc1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ws35g1r0j2xccsna4r6fc9a08przfi28kf9hciq3rmd6ndbr9c9"; + }; + + propagatedBuildInputs = [ requests py ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/devpi/devpi; + description = "Utilities jointly used by devpi-server and devpi-client"; + license = licenses.mit; + maintainers = with maintainers; [ lewo makefu ]; + }; +} diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 4f39d1097b1c..36181bfb3f95 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { "--enable-openmp" ]; - buildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ boost diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 9b2821380b98..e9bae3f82060 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -28,7 +28,8 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - buildInputs = [ hdf5 cython pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi ; propagatedBuildInputs = [ numpy six] diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 6a579cffccf5..faddfe2bfddb 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index 69d9dde6cbac..a88a60976110 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pygtk libsexy gtk2 glib pango libxml2 diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix new file mode 100644 index 000000000000..fa9067fa0fee --- /dev/null +++ b/pkgs/development/python-modules/livereload/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, django +, tornado +, six +, pytest +}: + +buildPythonPackage rec { + pname = "livereload"; + version = "2.5.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "lepture"; + repo = "python-livereload"; + rev = "v${version}"; + sha256 = "1irs59wqmffp8q4l9fh7givs05mamlgm5n7ga49gwxp5imwrdzba"; + }; + + buildInputs = [ nose django ]; + + propagatedBuildInputs = [ tornado six ]; + + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = { + description = "Runs a local server that reloads as you develop"; + homepage = "https://github.com/lepture/python-livereload"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 19d135fc0e1d..ffb74021d8d8 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,13 +1,14 @@ -{lib, fetchurl, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: buildPythonPackage rec { pname = "numpy"; - version = "1.13.1"; + version = "1.13.2"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numpy/numpy-${version}.zip"; - sha256 = "c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1fmq8923q91xyjf6fngl0n6jlysryyzx06288b5qdvv97mlfpklh"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix new file mode 100644 index 000000000000..329da89bf723 --- /dev/null +++ b/pkgs/development/python-modules/platformio/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, arrow, bottle, click_5, colorama +, lockfile, pyserial, requests +, semantic-version +, isPy3k, isPyPy +}: +buildPythonPackage rec { + disabled = isPy3k || isPyPy; + + pname = "platformio"; + version="3.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b4lba672l851sv1xwc320xbh46x7hx4ms6whc0k37hxkxj0nwm2"; + }; + + propagatedBuildInputs = [ + arrow bottle click_5 colorama + lockfile pyserial requests semantic-version + ]; + + patches = [ ./fix-searchpath.patch ]; + + meta = with stdenv.lib; { + description = "An open source ecosystem for IoT development"; + homepage = http://platformio.org; + maintainers = with maintainers; [ mog makefu ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/platformio/fix-searchpath.patch b/pkgs/development/python-modules/platformio/fix-searchpath.patch new file mode 100644 index 000000000000..a215ffc7d614 --- /dev/null +++ b/pkgs/development/python-modules/platformio/fix-searchpath.patch @@ -0,0 +1,11 @@ +--- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200 ++++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200 +@@ -395,7 +395,7 @@ + isdir(join(p, "click")) or isdir(join(p, "platformio"))) + if all(conditions): + _PYTHONPATH.append(p) +- os.environ['PYTHONPATH'] = os.pathsep.join(_PYTHONPATH) ++ os.environ['PYTHONPATH'] = os.pathsep.join(sys.path) + + + def get_serialports(filter_hwid=False): diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 284736fd4754..b4366ab791f9 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -31,7 +31,8 @@ in buildPythonPackage rec { }) ]; - buildInputs = [ python pkgconfig cairo xlibsWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index f8ca06eec86d..4995a7146931 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig libcangjie sqlite python cython + autoconf automake libtool libcangjie sqlite python cython ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index ce7210391c60..6afd10596bc6 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -13,7 +13,8 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - buildInputs = [ pkgconfig glib gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index b72bd8b9b529..63a21cb2befd 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -20,7 +20,8 @@ buildPythonPackage rec { configureFlags = "--disable-introspection"; - buildInputs = [ pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib ]; # in a "normal" setup, pygobject and pygtk are installed into the # same site-packages: we need a pth file for both. pygtk.py would be diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 0940ef00ac98..9b9adc64b755 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d"; }; - buildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ] ++ stdenv.lib.optional (libglade != null) libglade; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 499634236acd..7b89e6d1b28c 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -13,7 +13,8 @@ buildPythonPackage { patches = [ ./codegendir.patch ]; - buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index cf1e17d3141b..b4376730e623 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -37,7 +37,8 @@ in buildPythonPackage { ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ pkgconfig makeWrapper qt4 lndir dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 5d98544da886..9b3700bcd2a5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -2,7 +2,7 @@ , lndir, makeWrapper, qmake }: let - version = "5.8.1"; + version = "5.9"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { name = "PyQt-${version}"; @@ -18,7 +18,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy"; + sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb"; }; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix new file mode 100644 index 000000000000..95ab0f339b06 --- /dev/null +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pyserial"; + version="3.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf"; + }; + + checkPhase = "python -m unittest discover -s test"; + + meta = with lib; { + homepage = "https://github.com/pyserial/pyserial"; + license = licenses.psfl; + description = "Python serial port extension"; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix new file mode 100644 index 000000000000..b2d204e9b9b4 --- /dev/null +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, samba, pkgconfig +, setuptools }: + +buildPythonPackage rec { + version = "1.0.15.8"; + pname = "pysmbc"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "tar.bz2"; + sha256 = "07dzxfdqaj6zjg2rxxdww363bh8m02mcvgk47jw005cik9wc2rq5"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ setuptools samba ]; + + meta = with stdenv.lib; { + description = "libsmbclient binding for Python"; + homepage = https://github.com/hamano/pysmbc; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix new file mode 100644 index 000000000000..f9e04691c1cb --- /dev/null +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "semantic_version"; + version = "2.6.0"; + name = "${pname}${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"; + }; + + # ModuleNotFoundError: No module named 'tests' + doCheck = false; + + meta = with lib; { + description = "A library implementing the 'SemVer' scheme"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus makefu ]; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index b6094f37c3a5..af885fcf5a2a 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,13 +2,13 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { pname = "sip"; - version = "4.19.1"; + version = "4.19.3"; name = "${pname}-${version}"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e"; + sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix new file mode 100644 index 000000000000..3386fdd1e2a3 --- /dev/null +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "spambayes"; + version = "1.1b2"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d"; + }; + + propagatedBuildInputs = [ bsddb3 pydns lockfile ]; + + meta = { + description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; + homepage = http://spambayes.sourceforge.net/; + }; +} diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix new file mode 100644 index 000000000000..5b98aa3415b2 --- /dev/null +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, supervise +}: + +buildPythonPackage rec { + pname = "supervise_api"; + version = "0.1.5"; + + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + }; + + propagatedBuildInputs = [ supervise ]; + + # no tests + doCheck = false; + + meta = { + description = "An API for running processes safely and securely"; + homepage = https://github.com/catern/supervise; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index ab7de4bfa772..c0056eb66b3b 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -1,20 +1,15 @@ -{ stdenv -, fetchPypi -, buildPythonPackage -, semantic-version -, boto3 -, flask -, docutils +{ stdenv, fetchPypi, buildPythonPackage +, semantic-version, boto3, flask, docutils, requests }: buildPythonPackage rec { pname = "tiros"; name = "${pname}-${version}"; - version = "1.0.38"; + version = "1.0.39"; src = fetchPypi { inherit pname version; - sha256 = "0k668z9gb5vh304gysynj4rxgi24wy2vl4a33dnwkri2g6db3s4n"; + sha256 = "10wh84lpl7k8i69hlxwrzp2lln63w2afv9l7ij7r3lqjwd0z0skr"; }; patchPhase = '' @@ -22,5 +17,5 @@ buildPythonPackage rec { sed -i "s/'datetime',//" setup.py ''; - propagatedBuildInputs = [ semantic-version boto3 flask docutils ]; + propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ]; } diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 7b9712dfd023..1215e613f6fa 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , python +, fetchurl }: buildPythonPackage rec { @@ -17,6 +18,15 @@ buildPythonPackage rec { sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; }; + # Temporary patch until next release (later than 0.9.6) to fix + # a broken test case. + patches = [ + (fetchurl { + url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch"; + sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b"; + }) + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 51667bef143d..494b5ec30e6e 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let baseVersion = "4.4"; - revision = "0"; + revision = "1"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "00k2bb2pamqlq0i619wz8chii8yp884qnrjngzzxrdffk05d95wc"; + sha256 = "0kn1k2zvc93xin4kdp2fpiz21i5j0qymyx6jjzkqp7r3x8yxwr06"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6647d71bd006..ff5398a42931 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -39,7 +39,10 @@ let in { - atk = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + atk = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; bundler = attrs: let @@ -57,7 +60,8 @@ in }; cairo = attrs: { - buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; }; capybara-webkit = attrs: { @@ -85,29 +89,39 @@ in }; ffi = attrs: { - buildInputs = [ libffi pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libffi ]; }; gpgme = attrs: { buildInputs = [ gpgme ]; }; - gio2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + gio2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gitlab-markup = attrs: { meta.priority = 1; }; - glib2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + glib2 = attrs: { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre ]; + }; gtk2 = attrs: { - buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; - gobject-introspection = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + nativeBuildInputs = [ pkgconfig ]; + gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; }; grpc = attrs: { - buildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; }; hitimes = attrs: { @@ -170,7 +184,8 @@ in }; pango = attrs: { - buildInputs = [ gtk2 xlibs.libXdmcp pcre pkgconfig xlibs.libpthreadstubs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 xlibs.libXdmcp pcre xlibs.libpthreadstubs ]; }; patron = attrs: { @@ -208,7 +223,8 @@ in }; rmagick = attrs: { - buildInputs = [ imagemagick pkgconfig which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ imagemagick which ]; }; ruby-lxc = attrs: { @@ -223,7 +239,8 @@ in ]; }; rugged = attrs: { - buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake openssl libssh2 zlib ]; }; scrypt = attrs: @@ -300,7 +317,8 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - buildInputs = [ xapian_1_2_22 pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xapian_1_2_22 zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile ''; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index cbe6e5fdde9e..c960f54ab204 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index 7ca0291fad98..f2079b2b5a10 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [pkgconfig readline libusb perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb perl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1572fff40b9a..a4cf3bcd649b 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { '(*info->fprintf_func) (info->stream, "%s", errmsg);' ''; - buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index e9d7f4ea1941..4cbc3e626768 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { patchShebangs . ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb capnproto + cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index f5c5c616979c..9dc1e2db8c09 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; - buildInputs = [sqlite pkgconfig perl] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [sqlite perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index f21e9bba3f7f..2caadfc62667 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null; stdenv.mkDerivation rec { name = "snowman-${version}"; - version = "2017-07-22"; + version = "2017-08-13"; src = fetchFromGitHub { owner = "yegord"; repo = "snowman"; - rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea"; - sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf"; + rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03"; + sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6898b7eee54c..945f6c80af52 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - buildInputs = [ pkgconfig libxml2 llvm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 llvm ]; doCheck = true; meta = { diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 8970f7a86d19..e61b7f78302b 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,22 +1,31 @@ -{ stdenv, binutils, fetchgit }: +{ stdenv, binutils, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016.12.28"; + version = "2017-10-05"; name = "bloaty-${version}"; - src = fetchgit { - url = "https://github.com/google/bloaty.git"; - rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0"; - sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l"; + src = fetchFromGitHub { + owner = "google"; + repo = "bloaty"; + rev = "e47b21b01ceecf001e1965e9da249d48d86a1749"; + sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm"; fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; - configurePhase = '' - sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc + preConfigure = '' + substituteInPlace src/bloaty.cc \ + --replace "c++filt" \ + "${stdenv.lib.getBin binutils}/bin/c++filt" ''; + doCheck = true; + + checkPhase = "ctest"; + installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index f30aed29ba13..8701db8d161e 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.6.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1jdb8zbgafhz2qi0ajk34845kpmfhxchdimvwkq6lkb1159v0mr1"; + sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 56d4b831460a..253aadb86d73 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { ./impure-dirs.patch ]; - buildInputs = stdenv.lib.optionals guileSupport [ guile pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optionals guileSupport [ guile ]; configureFlags = stdenv.lib.optional guileSupport "--with-guile"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e5eda9c1956d..a5ea6df3c8df 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.2"; + name = "gradle-4.2.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1bifb3smmdxkfk94li2l63g2jxcl1bjca2bqcq2rqnp568yxcpai"; + sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm"; }; }; diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix index 858fc5b48df3..5da32f2334a7 100644 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ b/pkgs/development/tools/build-managers/nant/default.nix @@ -15,7 +15,8 @@ let name = "nant-bootstrapped-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper ]; buildFlags = "bootstrap"; @@ -35,7 +36,8 @@ in stdenv.mkDerivation { name = "nant-${version}"; inherit src; - buildInputs = [ pkgconfig mono makeWrapper nant-bootstrapped ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mono makeWrapper nant-bootstrapped ]; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 52c5417456ca..b7d75999fdf6 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://crystal-lang.org/; license = licenses.asl20; description = "Dependency manager for the Crystal language"; - maintainers = with maintainers; [ mingchuan ]; + maintainers = with maintainers; [ sifmelcara ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 828fe20ecc54..fd27d927bd57 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23"; }; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' Tupfile diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b1607aaaecd8..430e46f23030 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.0.0"; + version = "10.0.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "13rfpyzrld20pjhkjzx78qfdmi4w86v6nhq3460bcjpi4kwyd24w"; + sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "19z3rmkmv6z6g27bsjkqkfj8xwpyf9v1fhk2vb81xj5fisjzhmlw"; + sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "11gp6l5kqcz4spxq552hsnw480vdhp70zmqlgjr906px3r31j7h3"; + sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix new file mode 100644 index 000000000000..e22be524f021 --- /dev/null +++ b/pkgs/development/tools/dep/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dep-${version}"; + version = "0.3.1"; + rev = "v${version}"; + + goPackagePath = "github.com/golang/dep"; + subPackages = [ "cmd/dep" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "dep"; + sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + }; + + buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); + + meta = with stdenv.lib; { + homepage = https://github.com/golang/dep; + description = "Go dependency management tool"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.carlsverre ]; + }; +} diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index f724b65dd823..9da88f6c63d8 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, pythonPackages, glibcLocales} : +{ stdenv, pythonPackages, glibcLocales} : pythonPackages.buildPythonApplication rec { - name = "devpi-client-${version}"; - version = "2.7.0"; + name = "${pname}-${version}"; + pname = "devpi-client"; + version = "3.1.0rc1"; - src = fetchurl { - url = "mirror://pypi/d/devpi-client/${name}.tar.gz"; - sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3"; }; - - doCheck = false; + # requires devpi-server which is currently not packaged + doCheck = true; + checkInputs = with pythonPackages; [ pytest webtest mock ]; + checkPhase = "py.test"; LC_ALL = "en_US.UTF-8"; - buildInputs = with pythonPackages; [ glibcLocales tox check-manifest pkginfo ]; - - propagatedBuildInputs = with pythonPackages; [ py devpi-common ]; + buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ]; + propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ]; meta = { homepage = http://doc.devpi.net; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix new file mode 100644 index 000000000000..36c489b1171a --- /dev/null +++ b/pkgs/development/tools/devtodo/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, readline, ncurses }: + +stdenv.mkDerivation rec { + name = "devtodo-${version}"; + version = "0.1.20"; + + src = fetchurl { + url = "http://swapoff.org/files/devtodo/${name}.tar.gz"; + sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; + }; + + buildInputs = [ readline ncurses ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://swapoff.org/devtodo1.html; + description = "A hierarchical command-line task manager"; + license = licenses.gpl2; + maintainers = [ maintainers.woffs ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index ef339d47ea05..5f0b6b628cb2 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -11,6 +11,7 @@ python2Packages.buildPythonApplication { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ libxslt pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt intltool ]; propagatedBuildInputs = [ libxml2Python ]; } diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix new file mode 100644 index 000000000000..144bd059634f --- /dev/null +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -0,0 +1,39 @@ +{ lib, python, fetchFromGitHub }: + +with python.pkgs; + +buildPythonApplication rec { + pname = "mkdocs"; + version = "0.16.3"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "mkdocs"; + repo = "mkdocs"; + rev = version; + sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; + }; + + checkInputs = [ + nose nose-exclude mock + ]; + + NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests"; + + checkPhase = "nosetests mkdocs"; + + propagatedBuildInputs = [ + tornado + livereload + click + pyyaml + markdown + jinja2 + ]; + + meta = { + homepage = http://mkdocs.org/; + description = "Project documentation with Markdown"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index a971ae83e637..86f78891b2fc 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glfw mesa_glu pkgconfig glfw libXrandr libXdamage + glfw mesa_glu glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index d9171ca09f2b..3100b2c84df7 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender + gcc scons libX11 libXcursor libXinerama libXrandr libXrender freetype openssl alsaLib libpulseaudio mesa_glu zlib ]; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 7c8653a82bea..80c9ce3d432d 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; + nativeBuildInputs = [ pkgconfig ]; + # Note: Glib support is optional, but it's quite useful (e.g., it's used by # Guile-GNOME). - buildInputs = [ guile pkgconfig glib guile-lib ]; + buildInputs = [ guile glib guile-lib ]; propagatedBuildInputs = [ libffi ]; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index d79aa0980003..491d65d8882e 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, oniguruma }: +{ stdenv, fetchurl, fetchpatch, oniguruma }: stdenv.mkDerivation rec { name = "jq-${version}"; @@ -26,15 +26,16 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released # jq is linked to libjq: - configureFlags = [ - "LDFLAGS=-Wl,-rpath,\\\${libdir}" - ]; + configureFlags = stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + + installCheckPhase = "$out/bin/jq --help"; + doInstallCheck = true; - meta = { + meta = with stdenv.lib; { description = ''A lightweight and flexible command-line JSON processor''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux ++ darwin; downloadPage = "http://stedolan.github.io/jq/download/"; updateWalker = true; inherit version; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index abfbc9a6c471..1f4c21cb7f9c 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; - buildInputs = [ pkgconfig libzip glib libusb1 libftdi1 check libserialport + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa doxygen glibmm python ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index e421a709c895..57bb159c5863 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; }; - buildInputs = [ pkgconfig glib python3 libsigrok check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python3 libsigrok check ]; meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index ca8c2de9630f..37c5dab8ce87 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; - buildInputs = [ intltool pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool glib ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp -v ./misc/*.el $out/share/emacs/site-lisp diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index 77cb86766692..ca6cb14c2a43 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; }; - buildInputs = [ pkgconfig gcc perl libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc perl libusb ]; meta = { license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index a82fae132552..2adc61ce6456 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; }; - buildInputs = [ pkgconfig glib libuuid popt elfutils ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libuuid popt elfutils ]; meta = with stdenv.lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 4fec00a2fd7e..bd08c6c4c05e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -13,7 +13,8 @@ in pythonPackages.buildPythonApplication rec { sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; - buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 itstool intltool glib gtk3 gnome3.defaultIconTheme makeWrapper libwnck3 ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 17ef66470505..cef399eb5c12 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -16,7 +16,8 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index a6de652f9005..27dadd08e560 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib dbus dbus_glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index b8e2a9a189bc..cdddad5155ff 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; }; - buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 4ea939b01569..ca8d0c6f7173 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ glib bison flex pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib bison flex ]; meta = { description = "Preprocessor for making GObjects with inline C code"; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index f552fe00566b..25043f89463d 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ globalplatform pcsclite makeWrapper ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 2641a1ed04fc..71e9ee27a9e8 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 7e2416808879..4bcf5f1599a6 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -7,6 +7,8 @@ let "linux-AMD64" else if stdenv.system == "x86_64-darwin" then "macosx" + else if stdenv.system == "aarch64-linux" then + "linux-arm" else abort "Platform ${stdenv.system} not yet supported."; in @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { description = "IOzone Filesystem Benchmark"; homepage = http://www.iozone.org/; license = stdenv.lib.licenses.unfreeRedistributable; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; - maintainers = [ stdenv.lib.maintainers.Baughn ]; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; }; } diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 8449cf9b6f38..d1415569ca33 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - buildInputs = [ bison flex gperf ncurses pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison flex gperf ncurses ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 5cf8b6649418..45dd86db41b2 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; - buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 popt babeltrace ]; meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index bdc7f4f04148..cace3e7f0a94 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; }; - buildInputs = [intltool glib pkgconfig libgsf libuuid gcab bzip2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [intltool glib libgsf libuuid gcab bzip2]; meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 3349213a741b..2ab0dbd1b5f5 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; - buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libftdi libusb1 hidapi ]; configureFlags = [ "--enable-jtag_vpi" diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 2443c2804435..cde8eae0f7fc 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { setupHook = [ ./setup-hook.sh ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; doCheck = true; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 540db210eb4e..45a31ad66f20 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "sysbench-1.0.6"; - buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ vim libmysql libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index ceff549f3736..2a77fc42602a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { name = "universal-ctags-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; }; - nativeBuildInputs = [ pythonPackages.docutils ]; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; autoreconfPhase = '' ./autogen.sh --tmpdir diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 0f73f4c54afc..404bf08e74ee 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper }: diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 11909ec1a19b..f8dc96c2394b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,21 +1,19 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.0.3"; + version = "1.1.0"; - goPackagePath = "github.com/mitchellh/packer"; + goPackagePath = "github.com/hashicorp/packer"; subPackages = [ "." ]; src = fetchFromGitHub { - owner = "mitchellh"; + owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr"; + sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = https://www.packer.io; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix deleted file mode 100644 index 544facda0159..000000000000 --- a/pkgs/development/tools/packer/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/hashicorp/packer"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/packer"; - rev = "07decf99adc272a386e3a013846248810d9aa690"; - sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz"; - }; - } -] diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 84e146789244..27596878f346 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; - buildInputs = [ glib pkgconfig python scons ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib python scons ]; buildPhase = "scons prefix=$out"; installPhase = "scons prefix=$out install"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 8c03c32655a9..ee5de04a782d 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase -, darwin, writeScriptBin, cups +, darwin, writeScriptBin, cups, makeWrapper }: let @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite qtwebkit qtbase + makeWrapper ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL darwin.libobjc fakeClang cups @@ -98,6 +99,9 @@ in stdenv.mkDerivation rec { ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \ /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \ $out/bin/phantomjs + '' + '' + wrapProgram $out/bin/phantomjs \ + --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]} ''; preFixup = '' diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ac87870eb590..dc447465b238 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { --replace "/bin/cp" "${coreutils}/bin/cp" ''; - buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils zlib popt linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 4be334e20ed9..001560df0a04 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ binutils gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index a16bdbc539a9..89a1b5fe0aac 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ]; # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs postPatch = '' substituteInPlace buildrun.cxx --replace \ diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index f2b7d67915a0..2d36b09adb35 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"; }; - buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libsigrok libsigrokdecode ]; meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index c4dd8725a1c1..e3dda5094275 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" ''; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf pkgconfig freeglut mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 2c3fb763dc52..d05706a7fadf 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -10,7 +10,8 @@ buildGoPackage rec { goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index 432560242549..59252a938637 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr"; }; - buildInputs = [ pkgconfig libusb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb ]; buildPhase = '' make all misc diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 8d86c96e4bfe..c61d521ecabc 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.9.5"; + version = "2.0.0"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw"; - "i686-linux" = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk"; - "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc"; + "x86_64-linux" = "184amybyxqlxqr8fk6lyx2znmci1fazsiby90q7d1xx2ihz3hm5x"; + "i686-linux" = "19r1m5jila40x69m1qz2hslz7v1hdg8wwdhcq8d5qjnzwfmlw2qz"; + "x86_64-darwin" = "154400iqs01235bclr8ic7g9jv01lfs766bmv7p8784r3xsblvsr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; @@ -85,6 +85,22 @@ in stdenv.mkDerivation rec { ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin + # libiconv: iconv + rm opt/vagrant/embedded/bin/iconv + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + + # libxml: xml2-config, xmlcatalog, xmllint + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin + + # libxslt: xslt-config, xsltproc + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin + + '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' # ruby: erb, gem, irb, rake, rdoc, ri, ruby rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin @@ -101,24 +117,10 @@ in stdenv.mkDerivation rec { ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} done - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - # libffi ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + '') + '' mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix new file mode 100644 index 000000000000..fae0ca88124f --- /dev/null +++ b/pkgs/development/tools/vcstool/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python3Packages +, git, bazaar, subversion }: + +with python3Packages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "vcstool"; + version = "0.1.31"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ git bazaar subversion ]}"]; + + doCheck = false; # requires network + + meta = with stdenv.lib; { + description = "Provides a command line tool to invoke vcs commands on multiple repositories"; + homepage = https://github.com/dirk-thomas/vcstool; + license = licenses.asl20; + maintainer = with maintainers; [ sivteck ]; + }; +} diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix new file mode 100644 index 000000000000..eac2046a233d --- /dev/null +++ b/pkgs/development/web/kore/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + name = "kore-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "jorisvink"; + repo = "kore"; + rev = "${version}-release"; + sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; + }; + + buildInputs = [ openssl ]; + + postPatch = '' + # Do not require kore to be on PATH when it launches itself as a subprocess. + sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An easy to use web application framework for C"; + homepage = https://kore.io; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ johnmh ]; + }; +} diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index c700fd81a245..ad11542f04b0 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0ca067gg5z1798bazwzgg2yd2mbysvk8i2q2v3i8d0d188y2hj84"; }; - buildInputs = [ python pkgconfig glib vala_0_28 ctpl libgee libsoup fcgi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib vala_0_28 ctpl libgee libsoup fcgi ]; configurePhase = ''python waf configure --prefix=$out''; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index a7d6bbc63d91..0c95aa988943 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; - buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjpeg libX11 curl libogg libvorbis freetype openal mesa libXxf86vm ]; patchPhase = '' diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 77809f1095fc..35f5699a231b 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib unzip]; preConfigure='' diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 99f2b71b4495..37176750763f 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; }; - buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 2044782c1bde..3fceb796dde5 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = [ pkgconfig gtk2 freeglut SDL mesa libXi libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 freeglut SDL mesa libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index 1b587331371b..52aec1b8a590 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; }; - buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons SDL mesa physfs SDL_mixer ]; installPhase = '' scons prefix=$out install diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index 05d73a4eafe8..566b6f8cc82d 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; }; - buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons SDL mesa physfs SDL_mixer ]; installPhase = '' scons prefix=$out install diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 649d69c6fe67..28d273ad5cc4 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ./arch.patch ]; - buildInputs = [ pkgconfig SDL libogg libvorbis zlib unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL libogg libvorbis zlib unzip ]; enableParallelBuilding = true; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 85def0596dcc..2c544abddd07 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg mesa pcre pkgconfig SDL2 vimNox + expat curl jansson libpng libjpeg mesa pcre SDL2 vimNox ]; installPhase = with stdenv.lib; let diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index f5984806bd14..2ab6e04e2d82 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz"; sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"; }; - buildInputs = [SDL lua5_1 pkgconfig SDL_mixer SDL_image SDL_ttf]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL lua5_1 SDL_mixer SDL_image SDL_ttf]; postInstall='' mkdir -p "$out/share/games/fillets-ng/" tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1 diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 466cfda7c4a5..dd14edf8eb12 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec{ sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; }; - buildInputs = [ pkgconfig cmake perl gmp libtap gperf + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake perl gmp libtap gperf perlPackages.TemplateToolkit perlPackages.StringShellQuote perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting python3Packages.python python3Packages.random2 ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 4269d3a74dbb..114eaa3027b0 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ gtk2 glib pkgconfig mesa wxGTK libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 glib mesa wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index e74177a1ee31..1527a22b4abe 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6"; }; - buildInputs = [ pkgconfig python glib gtk2 readline ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 296687c5d92d..8aba24dd3468 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc + SDL_ttf SDL_net cmake lua5_1 SDL SDL_mixer SDL_image fpc qt4 ghc ffmpeg freeglut makeWrapper physfs ]; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 2c360241fb9d..ffa414cac3a1 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-llua -lgcc_s"; - buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer pkgconfig lua zlib unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer lua zlib unzip ]; configurePhase = '' { echo 2; echo $out; } | ./configure.sh diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 83f8f1a8be7b..5ce50d6b463c 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0"; }; - buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper intltool curl gtk3 ]; postInstall = '' wrapProgram $out/bin/klavaro \ diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 1d50ea14551a..d6a2afb26cb8 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0mcldn8ivlfyjfx22ygzcbbw3bzl0j6vi3g6jyj8jmcrni61mgmb"; }; - buildInputs = [ ncurses autoreconfHook SDL2 SDL2_mixer ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses SDL2 SDL2_mixer ]; meta = with stdenv.lib; { description = "A humorous politically themed ncurses game"; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 5718ed1918ee..72b0b0d00cdd 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb"; }; - buildInputs = [ pkgconfig gtk openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk openssl ]; meta = { description = "Mascot Constructive Pilot for X"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 80769ab4f57a..3fafcfddcbfb 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; }; - buildInputs = [ cmake pkgconfig git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index 441171662560..c70744ea2991 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; }; - buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 7c2d168d6c37..2a162525388f 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./cmakepaths.patch ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ogre cegui boost sfml openal ois ]; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index b15406b1e3d1..53c2cc5d073a 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -23,7 +23,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal pkgconfig libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal libXt ]; meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 43cdc2031bf5..8b8a6fed8410 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; s = # Generated upstream information rec { baseName="pingus"; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 254b65cc4d91..3898ddba7139 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; }; - buildInputs = [ gtk2 pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 27dabe1deacd..b6a74ad8be65 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; }; - buildInputs = [ gtk2.dev pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2.dev ]; meta = { homepage = http://keldon.net/rftg/; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index a118a75aefe0..0d0602524e79 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index abad2188a0dd..df89f9dc743d 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"; - buildInputs = [ SDL SDL_mixer autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ SDL SDL_mixer ]; meta = { homepage = http://ri-li.sourceforge.net; diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 14af1e3c7886..16e36a03dce0 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; }; - buildInputs = - [ pkgconfig ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses ]; meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 1288ff1a27f5..02f6026371fe 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -115,7 +115,8 @@ let sourceRoot = "."; - buildInputs = [ pkgconfig zlib libpng bzip2 SDL SDL_mixer unzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; configurePhase = let # Configuration as per the readme.txt and config.template diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 6ba91feced83..36256d31fda7 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp + cmake wxGTK30 openal curl gettext libtorrentRasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 70601200a248..c147bfb77ad7 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 4d2db9d293f5..e05f5a92a33a 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -25,8 +25,9 @@ in stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake libtool pkgconfig + cmake libtool libX11 libXrandr openal freealut mesa libvorbis libogg gettext zlib freetype curl fribidi bluez libjpeg libpng diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index c90972db66ea..ce0fc3f6c90f 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; - buildInputs = [ SDL mesa SDL_image freealut openal libvorbis pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL mesa SDL_image freealut openal libvorbis ]; postPatch = '' sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d1416b0685a7..c6f4b57a0334 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -59,7 +59,8 @@ in stdenv.mkDerivation rec { library can be found. Obviously, though, this is a hack. */ NIX_LDFLAGS="-lgcc_s"; - buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip mesa]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 98fe9d7c6f68..27eef2614263 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; }; - buildInputs = [ pkgconfig scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; buildPhase = '' cp -r --reflink=auto $data data diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index f83c5ac360a4..85246aea2d5f 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; - buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper ]; installPhase = '' diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 1f8e559b4152..d005f6becadb 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 38cfb75fa091..114568fdd528 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 libxml2 libtool diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index bdba1eb7b817..799b14dec1d0 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - buildInputs = [ pkgconfig perl cups dbus enscript ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl cups dbus enscript ]; preConfigure = '' diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 4e0b609fdb0c..ffb2052ca0c1 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { substituteInPlace Makefile --replace /usr/local "$out" ''; - buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { homepage = http://pingus.seul.org/~grumbel/xboxdrv/; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 9cf70db471cc..4fff6f6b8c17 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - buildInputs = [ udev ncurses pkgconfig bluez ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ncurses bluez ]; configureFlags = "--with-doxygen=no"; diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 12c76c89790a..70e7351e295c 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -1,28 +1,24 @@ -{stdenv, fetchurl, libX11, libXt, libXext, libXaw }: +{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }: -assert stdenv.system == "i686-linux"; +stdenv.mkDerivation rec { + name = "darcnes-${version}"; + version = "9b0401"; -stdenv.mkDerivation { - name = "darcnes-9b0401"; src = fetchurl { - url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz; + url = "https://web.archive.org/web/20130511081532/http://www.dridus.com/~nyef/darcnes/download/dn${version}.tgz"; sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3"; }; - buildInputs = [ libX11 libXt libXext libXaw ]; - - installPhase = '' - mkdir -p $out/bin - cp darcnes $out/bin - ''; - patches = [ ./label.patch ]; + buildInputs = [ libX11 libXt libXext libXaw ]; + installPhase = "install -Dt $out/bin darcnes"; + meta = { - homepage = http://www.dridus.com/~nyef/darcnes/; - description = "Multi-System emulator, specially for NES"; - /* Prohibited commercial use, credit required. */ + homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/; + description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; + # Prohibited commercial use, credit required. license = stdenv.lib.licenses.free; + platforms = [ "i686-linux" ]; }; - } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index f606e352a7b0..8025cf766f07 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ca36d16072d7..41dbfd1999c4 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libevdev libXdmcp portaudio libusb libpulseaudio ]; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index 95d03c425e35..a17dd6a775ea 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ SDL SDL_net SDL_sound libpng mesa ]; desktopItem = makeDesktopItem { name = "dosbox"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 9f33305ae143..b700b22807c4 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 42469c5daf4a..ce8f8e030e30 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - scons zlib SDL lua5_1 pkgconfig + scons zlib SDL lua5_1 ]; phases = "unpackPhase buildPhase"; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 172b2a2eb3e2..8b2409b74c33 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; }; - buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 34507a252526..bfe43403bc6c 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index a03695eed772..1172a89caf32 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,36 +1,42 @@ -{ stdenv, fetchurl, pkgconfig -, libX11, mesa, freeglut -, libjack2, libcdio, libsndfile, libsamplerate -, SDL, SDL_net, zlib -}: +{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - name = "mednafen-${version}"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; - sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; + sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; - buildInputs = - [ pkgconfig libX11 mesa freeglut libjack2 libcdio - libsndfile libsamplerate SDL SDL_net zlib ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + freeglut + mesa + libcdio + libjack2 + libsamplerate + libsndfile + libX11 + SDL + SDL_net + zlib + ]; + + hardeningDisable = [ "pic" ]; - # Install docs postInstall = '' - mkdir -p $out/share/doc/$name - cd Documentation - install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt + mkdir -p $out/share/doc + mv Documentation $out/share/doc/mednafen ''; meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 91a74171da9a..75eeeea4c008 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; version = "0.5.2"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; + url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; }; - postInstall = '' - mkdir -p $out/share/$name - install -m 644 -t $out/share/$name standard.conf - ''; + postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index ea35ee8ac54b..7de9b576ef37 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw"; }; - buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost dash freetype libpng SDL which zlib ]; buildPhase = '' dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus" diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 171453b89d5b..5e5ce9edca4b 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index be872250d032..41ba5a3b2e61 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; - buildInputs = [ pkgconfig SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 ]; meta = { description = "An open-source Atari 2600 VCS emulator"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ca1881bdd5fa..318993d08b66 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9fb90875b976..0f59892cce1e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional tiffSupport pkgs.libtiff ++ lib.optional odbcSupport pkgs.unixODBC - ++ lib.optional netapiSupport pkgs.samba3_light + ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses ++ lib.optional vaSupport pkgs.libva-full ++ lib.optional pcapSupport pkgs.libpcap diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index aaaec67c751e..fb384aee746e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.17"; + version = "2.18"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; + sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; + sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 23d91040b125..fb99421a61ae 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchurl, config -, cmake, pkgconfig -, doxygen -, qt -, libXmu, mesa, openal, SDL2, freeglut -}: +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa +, freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${meta.version}"; + name = "yabause-${version}"; + # 0.9.15 only works with OpenGL 3.2 or later: + # https://github.com/Yabause/yabause/issues/349 + version = "0.9.14"; src = fetchurl { - url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; }; - patches = [ ./linkage-rwx-linux-elf.diff ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase mesa freeglut openal SDL2 ]; - buildInputs = - [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ]; + patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; - cmakeConfigureFlags = [ - "-DYAB_PORTS='qt'" - "-DYAB_OPTIMIZED_DMA='ON'" - "-DYAB_NETWORK='ON'" ] ; + cmakeFlags = [ + "-DYAB_NETWORK=ON" + "-DYAB_OPTIMIZED_DMA=ON" + "-DYAB_PORTS=qt" + ] ; meta = with stdenv.lib; { - version = "0.9.14"; description = "An open-source Sega Saturn emulator"; - homepage = http://yabause.org/; + homepage = https://yabause.org/; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: Qt5 diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch new file mode 100644 index 000000000000..5f13d2ee1837 --- /dev/null +++ b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch @@ -0,0 +1,10 @@ +--- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 ++++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 +@@ -230,7 +230,6 @@ + <property name="title"> + <string>&Help</string> + </property> +- <addaction name="aHelpEmuCompatibility"/> + <addaction name="aHelpAbout"/> + </widget> + <widget class="QMenu" name="mTools"> diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch index bb0491b373f8..bb0491b373f8 100644 --- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff +++ b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index aec79f1c5cf5..2d210ca00986 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,7 +6,8 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; }; }; } diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 36593794ed7c..25441a30d86b 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; }; - buildInputs = [ pkgconfig jansson libsailing ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ jansson libsailing ]; INSTALL_PATH = "$(out)"; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index f05073469b73..1dc03e1e9f03 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook libX11 + autoreconfHook libX11 pam libgcrypt libXrender imlib2 ]; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index b13e9c7866c9..a0dac519a0b8 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { # Patch so that systemd is "found" when configuring. patches = [ ./systemd.patch ]; - buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which xfce.xfce4_dev_tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ]; preConfigure = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 25994ba35622..7b280d770b38 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index 7aada4711455..500f7a9c5a3f 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r"; }; - buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake docutils glib libpthreadstubs libXau libXdmcp xcbutil ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index e5b6bf0d167c..a278e6dc949f 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; }; - buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ]; makeFlags = [ "bindir=$(out)/bin" diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 887c179c59d5..1aa1f347ab45 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; }; - buildInputs = [ python pkgconfig xlibsWrapper pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6ce337855d99..d302fbe6d4b6 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ]; propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 114e18dc93f8..4fef8d080434 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; - buildInputs = [ pkgconfig python pygtk gettext texinfo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python pygtk gettext texinfo ghostscript librsvg gdk_pixbuf txt2man makeWrapper ]; diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix new file mode 100644 index 000000000000..d8a3ecaa4119 --- /dev/null +++ b/pkgs/misc/themes/deepin/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "deepin-gtk-theme-${version}"; + version = "17.10.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-gtk-theme"; + rev = version; + sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Deepin GTK Theme"; + homepage = https://github.com/linuxdeepin/deepin-gtk-theme; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix index 81609eff55ab..4ec5b5da0a4a 100644 --- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "A very flexible theme engine"; diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix index e64b13f93055..966190a5e768 100644 --- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "Theme engines for GTK+ 2"; diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/materia-theme/default.nix index cd652440efae..755a0b737ca3 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "flat-plat-gtk-theme-${version}"; - version = "20170917"; + name = "materia-theme-${version}"; + version = "20171005"; src = fetchFromGitHub { owner = "nana-4"; - repo = "Flat-Plat"; + repo = "materia-theme"; rev = "v${version}"; - sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0"; + sha256 = "0znm7mx2nv2sgvy8fyams1ckp1ly3nbbs0k09d24w1zzd90xhzqp"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design-like theme for GTK+ based desktop environments"; - homepage = https://github.com/nana-4/Flat-Plat; + description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.mounium ]; diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index 4e1963536a87..233a73df868e 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2017-07-26"; + version = "2.6.7"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "858e6292c4336302be4d499c9b085a891b4c3b40"; - sha256 = "1z9l13px79yk42874dlh8z6p7chlngwarfnki89win3g2xvclz8q"; + rev = version; + sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e3d6d40bdac7..125df39ae8a6 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; rev = "v${version}"; - sha256 = "1ndy58ypilabf9pfkqzzl7wf6x1vr4gpvsbn30sygp2ip908q0xz"; + sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik"; }; buildInputs = with stdenv.lib; [ diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 4cf533110705..67c5ff140874 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - buildInputs = [ autoreconfHook pkgconfig fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = { description = "Automounter in userspace"; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 23e1f430dec3..940dde1f75dd 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "02b75fyfmm9m2iz59d3xa97cas4f697a4pzdxn1i64kjd36iv3yq"; }; - buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 9105f635ae93..002e458b24de 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.2"; + ver = "2017.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix"; + sha256 = "0202mxp7hwflkqnkkajx5lv1nxjng45q5gcvvdv68x46p8ikb5n2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 7ea8cf6d1bf6..6ff3903c4f2f 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.2"; + ver = "2017.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64"; + sha256 = "1a48kc2v8cb1757pxlli96qf3d7x7k3qw04rjadfs0iy09sz1ir9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4514e18f44f5..4f8a85d5d887 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2017.2"; in +let base = "batman-adv-2017.3"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0krr6waxkmms23cacfzngddxy1vq577s54wy2fgx6lyb4579g1yl"; + sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index eb5d2a31e83a..b8ece86c1401 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # Remove patch once the kernel headers are updated patches = [ ./add-ip6-header.patch ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; postInstall = '' # The bridge utils build does not fail even if the brctl binary diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index e51cc582ccf6..6cc4dc6f6d51 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost autoreconfHook pkgconfig + boost autoreconfHook fuse libtorrentRasterbar curl ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2eb1888a85f8..c09fc0f7dc41 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -89,7 +89,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib cmake libXinerama ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib cmake libXinerama ] ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index f04f6f897602..20b64907c22b 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 47f49a3da40b..ef8c55853a39 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ devicemapper openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 4c47104c5b67..a63aceedee37 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig directfb zlib libjpeg xproto + directfb zlib libjpeg xproto ]; meta = { diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index cf4f0386b499..e44a50233c34 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; - buildInputs = [ pkgconfig libvirt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 9e61c377ecf9..091a0d4b46f4 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -8,13 +8,15 @@ let url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib pkgconfig gperf utillinux + glib gperf utillinux ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e97f911534a1..e7a540b6671e 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,8 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gpm freetype fontconfig ncurses libx86]; in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index ee94ad4226e1..f2bb9bddd578 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -14,7 +14,8 @@ let version = "8"; in "TARGETDIR=$(out)/boot/efi/nixos/" "prefix=$(out)/" ]; - buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnu-efi libsmbios popt gettext ]; propagatedBuildInputs = [ efivar ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "all" ]; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1564069a0a98..8efef4fac4bd 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "fscrypt-${version}"; - version = "0.2.1"; + version = "0.2.2"; goPackagePath = "github.com/google/fscrypt"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "google"; repo = "fscrypt"; rev = version; - sha256 = "0ais6l0dxinnspi6cjnzyk55cdkfsz2bzbaybg6cb4q8a5kzaccq"; + sha256 = "0a85vj1zsybhzvvgdvlw6ywh2a6inmrmc95pfa1js4vkx0ixf1kh"; }; buildInputs = [ libargon2 pam ]; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 119621d92781..1494d9f06a8a 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7"; }; - buildInputs = [ autoreconfHook pam ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam ]; preConfigure = '' sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index c385971104dd..a299fd0f4338 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s"; }; - buildInputs = [ autoconf automake dbus glib libtool pkgconfig udisks2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index c3730dd8de50..55bc80a173ea 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1h3rydnaswcmlradafpw8q18zj88bbziad2vb6gn0q7ydr48f3jm"; }; - buildInputs = [ autoreconfHook pkgconfig openssl attr keyutils asciidoc libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl attr keyutils asciidoc libxslt ]; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 1d312be42ec7..b64278ae4ba0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if"; + sha256 = "0l2w84cwr54gaw3cbxijf614l76hx8mgcz57v81rwl68z3nq3yww"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 2a6294e3b5b9..ac064d9647a8 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j"; }; - buildInputs = [ libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnl ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 6b79045ac67d..43edd8723a01 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; - buildInputs = [ autoreconfHook pkgconfig libnl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libnl ]; postPatch = '' chmod u+w -R ../common diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6d04340ab46b..a528df26964b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -245,6 +245,9 @@ with stdenv.lib; USB_SERIAL_KEYSPAN_USA49W y USB_SERIAL_KEYSPAN_USA49WLC y + # Device mapper (RAID, LVM, etc.) + MD y + # Filesystem options - in particular, enable extended attributes and # ACLs for all filesystems that support them. FANOTIFY y diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index c45afd1cbeb1..043a39ec95a4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.4"; + version = "4.13.5"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0"; + sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 6531323c1d57..e9b9fb54bfc8 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.52"; + version = "4.9.53"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz"; + sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d0d5466ff0ff..d141d7f4211c 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.4"; + version = "4.13.5"; revision = "a"; - sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm"; + sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7d67bc2ff605..fb51760ec16a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc2"; - modDirVersion = "4.14.0-rc2"; + version = "4.14-rc3"; + modDirVersion = "4.14.0-rc3"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0ahcmr0y9i47lwjn140w436hg68apnh8rl66y56qdvdic8f61mj4"; + sha256 = "049x4fpcj8d6577lhzrns7w36mj21pfr4ijw01r0l6n3w86z28b7"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index f01f39289501..b64242e911db 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper ]; - buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ + flex bison libiberty libaudit makeWrapper pkgconfig ]; + buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 8c2badc3d686..93d2ac8b0312 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 7fe0a2be10f5..81333ce790ed 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; meta = { homepage = http://0pointer.de/public/; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index c7da0fcca2a9..f20efcb32373 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126"; }; - buildInputs = [ pkgconfig libsepol pcre ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsepol pcre ] ++ optionals enablePython [ swig python ]; # Avoid this false warning: diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 9f71b4a1ed3d..98ec778e2c26 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j"; }; - buildInputs = [ pkgconfig libxml2 perl autoreconfHook doxygen ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxml2 perl doxygen ]; # It tries to install some Python stuff even when Python is disabled. installFlags = "pkgpythondir=$(TMPDIR)/python"; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 3d5a76144af5..0d79027d8b79 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # INFO: It is important to list 'systemd' first as for now miraclecast # links against a customized systemd. Otherwise, a systemd package from # a propagatedBuildInput could take precedence. - buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd udev glib readline ]; meta = { homepage = https://github.com/albfan/miraclecast; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 58dc3a481737..4b5e7bbf3e3d 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - buildInputs = [ makeWrapper pkgconfig utillinux openssl libcap_ng python27 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper utillinux openssl libcap_ng python27 perl procps which ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index a4f52517df4b..dfcd53ec7786 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5"; }; - buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; patches = [ ./insert_utillinux_path_hooks.patch ]; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 8ec46d64600a..3801036f9e57 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - buildInputs = [ pkgconfig fuse pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse pcre ]; prePatch = '' # do not set sticky bit in nix store diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fa3c2fc4c7e3..4fd716ab8db8 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig dbus libcap ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libcap ]; meta = { homepage = http://0pointer.de/blog/projects/rtkit; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index cd0c283edbb2..75fbacfb90ef 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.1"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + version = "0.7.2"; + sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fdd5ada19cba..7c8ffef86eec 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -21,16 +21,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; - buildInputs = - [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror - libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor - iptables gnu-efi + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not worth it. */ autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror + libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor + iptables gnu-efi + ]; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 2dfc8f1b5207..8b3ebd46c325 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - buildInputs = [ automake autoconf pkgconfig udisks dbus_glib glib confuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 158ff2299b18..303d6bcdaa62 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; - buildInputs = [ pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; postInstall = '' diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index b00fc7296a01..94e5d998cd01 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - buildInputs = [ pkgconfig dbus libnotify udisks2 gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libnotify udisks2 gdk_pixbuf ]; NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 277c6d19f5b3..5391a699b925 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170810"; + version = "0.0.20171001"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"; + sha256 = "ecff9a184685b7dd2d81576eba5bd96bb59031c9e9b5eeee05d6dc298f30998e"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index a392d065e419..5f7bca097bf6 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 pkgconfig lm_sensors + gtk2 lm_sensors ]; patches = [ ./remove-unused-variables.patch diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6ab9063d7194..dfcb3896244a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,8 +38,9 @@ let patches = extraPatches; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] + nativeBuildInputs = [ autoreconfHook nukeReferences ]; + buildInputs = + optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work @@ -138,9 +139,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.1"; + version = "0.7.2"; - sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; extraPatches = [ (fetchpatch { diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index e5c545c37bbb..3b67171a474e 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; }; - buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; prePatch = '' sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index d83e32bcb392..4b71aaeca3ad 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; }; - buildInputs = [ libusb pkgconfig pmutils udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d0b8567c7483..9c4bc4bda736 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl flex bison groff libxml2 utillinux libtool which ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 70deadb74e14..0e8d1e70bc70 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost openssl pkgconfig systemd + boost openssl systemd ] ++ optional enableLua [ lua luajit ] ++ optional enableProtoBuf protobuf; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index bcbb6bb120ef..8a669d78d57a 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; }; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 678fb42acd57..ad4ed0a11adc 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.32.0"; + version = "3.2.33.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0bwcqwh9g8yrkh1schfr30jf5m2w3r2raczq5x94vjfs8i6dmqh0"; + sha256 = "1f8rcpbj6j46d46r6pmxvwz0mzxcjra47zx4ffvk8vi78m8kr56g"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 7ff0584818da..84c24e684786 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd fcgi ]; # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd postPatch = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ecf9ee9d84a4..93fe205a8f9d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,7 +5,6 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 -, fetchpatch }: let optional = stdenv.lib.optional; @@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.27"; + version = "2.4.28"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; + sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; }; # FIXME: -dev depends on -doc @@ -40,15 +39,6 @@ stdenv.mkDerivation rec { sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; - patches = [ - (fetchpatch { - name = "CVE-2017-9798.patch"; - url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; - sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; - stripLen = 3; - }) - ]; - # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index a99f081b24eb..8a773631ee6c 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { ./fixdeps.patch ]; - buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 80cbf12d2a6b..d681146eee5d 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apacheHttpd avahi apr ]; patches = [ (fetchpatch { url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index e5f4ada33010..c3e15ed846db 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; }; - buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 ++ stdenv.lib.optional enableMysql mysql.lib; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 64d0a9b79524..5ec0c7d4da5e 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.4"; - sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; + version = "1.13.5"; + sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; }) diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index a4fd046e5696..b2c80b3f88fc 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; - buildInputs = [ gmp pkgconfig redland zlib librdf_raptor2 librdf_rasqal ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ]; preConfigure = '' # Define _XOPEN_SOURCE to enable, e.g., getaddrinfo. diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index a2571600dfe7..637b7dd8b92b 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu + perl pam nspr nss openldap db cyrus_sasl svrcore icu net_snmp kerberos pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 91b9ed972d8c..33da203c502d 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.27"; + name = "dovecot-2.2.32"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; + sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 385cf7d35ba8..3df0b41c2cab 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.10"; + version = "0.4.20"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9"; + sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index d503a4d7b571..b4cec18d030e 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ coreutils db openssl pcre perl ]; preBuild = '' sed ' diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index a96e4cb37c01..b4f671862f88 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; - buildInputs = [pkgconfig openssl lua5 curl readline bison expat]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl lua5 curl readline bison expat]; configurePhase = '' export WHERE=$prefix/ diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index a4186559e89f..8c00bcdbee25 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' cp -Rp ${libCommonSrc}/* ${srcRoot}/common; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index f2df0e4f9c3d..398e75f4fac5 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0w4ldihs6j508ql7c0v2wsysrlf3n93iikvjwsszj6g5a4bz2f93"; + sha256 = "1sgrnk90hn99c1xq49al5n76j2qqfi7sjc6r2fr00gd7mxzbh1mg"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0l96f03ghvadcba7yi22wsx16chff4ffjgnm2g3mcyigbhp57zk2"; + sha256 = "19l1abq8qklhsqq1z4mi08c9z139b8gfyay7pwp4xmjxfzpsff64"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 30c0681adb7d..1d0b5fb83362 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; - buildInputs = [ autoreconfHook file perl unzip openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ file perl unzip openssl ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 27e6dea01ecc..6521408580df 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.8.1"; + version = "0.9.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd"; + sha256 = "03sc1h8jfxaw7c5d6lkj6x653zhxhh0v29n6db3319nsfx00nrag"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 8d5450127d65..08ee6b4e88a3 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.7.1"; + version = "1.7.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "11acdwn2fw5qnyns5vdbxw18xnd2v4hb1y2cfjjxw478hhza4ni3"; + sha256 = "0a2qlcx4p6mwgff9hc2h3sm1glh6syb38jfxabsx2clmj0gq2dq1"; }; docheck = true; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index b8253cf0ad4f..afc6f4e31599 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -48,7 +48,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 6429d3fae53f..e951d3706e9d 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -57,7 +57,8 @@ in -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c ''; - buildInputs = [ pkgconfig postgresql curl openssl zlib ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ] ++ stdenv.lib.optional enableSnmp net_snmp ++ stdenv.lib.optional enableSsh libssh2 ++ stdenv.lib.optional enableLdap openldap; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cc54aa3b37aa..cd541f82d238 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -29,7 +29,8 @@ in configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; - buildInputs = [ pkgconfig postgresql curl openssl zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql curl openssl zlib ]; postInstall = '' diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index a48ee83755b5..d9adc0f31029 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,24 +1,17 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, doxygen }: +{ stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { - version = "${passthru.majorVersion}.${passthru.minorVersion}"; + version = "2.13"; name = "libmpdclient-${version}"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "06rv2j8rw9v9l4nwpvbh28nad8bbg368hzd8s58znbr5pgb8dihd"; + sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; }; - nativeBuildInputs = [ autoreconfHook doxygen ]; - - enableParallelBuilding = true; - - passthru = { - majorVersion = "2"; - minorVersion = "11"; - }; + nativeBuildInputs = [ meson ninja ]; meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 63a781c59413..a323cd4802cf 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "9"; + minor = "10"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1"; + sha256 = "0i170kfn68x683fsm5rba0zbpjfr1r7s6a8nvdbva2yl0aizfzhs"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index e3e3de36575e..3a1e91b26eb0 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m"; }; - buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ffd2ad187961..ec4e78a54ece 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0z5145xnwmmim5j25ylghhhm74nvijqb8iyq5azq9vjmkz5xcd7b"; + sha256 = "0wgvvpk7h7psy41a32f0ljh6iasjsqbf4pxi8nhybl46m35srg48"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Sharing solution for files, calendars, contacts and more"; homepage = https://nextcloud.com; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + maintainers = with stdenv.lib.maintainers; [ schneefux bachp ]; license = stdenv.lib.licenses.agpl3Plus; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b2126a698336..27731af3803e 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/ patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ]; - buildInputs = [ autoconf automake pkgconfig libtool trousers openssl libxml2 libuuid gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ]; preConfigure = '' substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index bd80560a0cb4..85ee3ddcf744 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ libsndfile speexdsp fftwFloat ] + [ libtool libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 18cd936e8fc5..c1d9655ef23a 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct ''; - buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons openssl protobuf boost zlib ]; buildPhase = "scons"; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 17095750dbfd..ead0c095d5c9 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "--enable-id64" ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index cad349c4b51f..2a36e1f67a26 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./shellinabox-minus.patch ]; - buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam openssl openssh makeWrapper ]; # Disable GSSAPIAuthentication errors. Also, paths in certain source files are # hardcoded. Replace the hardcoded paths with correct paths. diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 9f7e2b297ee3..9a1ea5b55800 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { --replace AS=\''${AS} AS=yasm ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - openssl ncurses curl pkgconfig gnutls readline perl libjpeg + openssl ncurses curl gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which lua libopus libsndfile ]; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 3395be9b9c1d..0ba5a3ee5adb 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; - buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ucommon libosip libexosip gnutls zlib ]; preConfigure = '' export configureFlags="--sysconfdir=$out/etc" diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix new file mode 100644 index 000000000000..c6ef5a3a4df2 --- /dev/null +++ b/pkgs/servers/softether/4.20.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl +, openssl, readline, ncurses, zlib }: + +let + os = if stdenv.isLinux then "1" + else if stdenv.isFreeBSD then "2" + else if stdenv.isSunOS then "3" + else if stdenv.isDarwin then "4" + else if stdenv.isOpenBSD then "5" + else ""; + cpuBits = if stdenv.is64bit then "2" else "1"; + +in + +stdenv.mkDerivation rec { + name = "softether-${version}"; + version = "4.20"; + build = "9608"; + compiledDate = "2016.04.17"; + dataDir = "/var/lib/softether"; + + src = fetchurl { + url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e"; + }; + + buildInputs = [ openssl readline ncurses zlib ]; + + preConfigure = '' + echo "${os} + ${cpuBits} + " | ./configure + rm configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with stdenv.lib; { + description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = https://www.softether.org/; + license = licenses.gpl2; + maintainers = [ maintainers.rick68 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a2e5fbb6df9e..d6731a5b7dc3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.26"; + version = "10.1.28"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "0ggpdcal0if9y6h9hp1yv2q65cbkjfl4p8rqk68a5pk7k75v325s"; + sha256 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8a3097ae9dee..cf3349dc1660 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -85,7 +85,6 @@ let license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; }; }); @@ -115,4 +114,10 @@ in { sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; }; + postgresql100 = common { + version = "10.0"; + psqlSchema = "10.0"; + sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + }; + } diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix index b4955f8184c2..3e01d9bfe2ca 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "pgjwt-${version}"; - version = "0.0.1"; + version = "unstable-2017-04-24"; src = fetchFromGitHub { owner = "michelp"; repo = "pgjwt"; - rev = "12a41eef15e6d3a22399e03178560d5174d496a3"; - sha256 = "1dgx7kqkf9d7j5qj3xykx238xm8jg0s6c8h7zyl4lx8dmbz9sgsv"; + rev = "546a2911027b716586e241be7fd4c6f1785237cd"; + sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; }; dontBuild = true; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index edd99aa9a69b..78ad88bc9047 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; }; - buildInputs = [ postgresql pkgconfig libmsgpack groonga ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql libmsgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix new file mode 100644 index 000000000000..b17446ca7786 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: + +stdenv.mkDerivation rec { + name = "pgtap-${version}"; + version = "0.97.0"; + + src = fetchFromGitHub { + owner = "theory"; + repo = "pgtap"; + rev = "v${version}"; + sha256 = "1vzc8pxzi0rbywmrvx7i5awngsvzcz75i4jl9bk2vqr223chax6f"; + }; + + nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; + + installPhase = '' + install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "pgTAP is a unit testing framework for PostgreSQL"; + longDescription = '' + pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. + It includes a comprehensive collection of TAP-emitting assertion functions, + as well as the ability to integrate with other TAP-emitting test frameworks. + It can also be used in the xUnit testing style. + ''; + maintainers = with maintainers; [ willibutz ]; + homepage = http://pgtap.org; + inherit (postgresql.meta) platforms; + }; +} diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix index d434fa98e09b..c3a452132f28 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg"; }; - nativebuildInputs = [ pkgconfig ]; + nativenativeBuildInputs = [ pkgconfig ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 8b963e586632..851149ad7f71 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl pkgconfig python + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python which zlib ]; preConfigure = '' diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 8871c01e1a16..0ccf4c5bd0be 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; - buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7c052d8ef49f..12ba110acbf5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -26,7 +26,8 @@ let url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -37,7 +38,8 @@ let url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; - buildInputs = [pkgconfig libX11 xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXt ;}; @@ -48,7 +50,8 @@ let url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; - buildInputs = [pkgconfig libXfont ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont ;}; @@ -59,7 +62,8 @@ let url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -70,7 +74,8 @@ let url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -81,7 +86,8 @@ let url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -92,7 +98,8 @@ let url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -103,7 +110,8 @@ let url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -114,7 +122,8 @@ let url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -125,7 +134,8 @@ let url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -136,7 +146,8 @@ let url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; - buildInputs = [pkgconfig xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto ;}; @@ -147,7 +158,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -158,7 +170,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -169,7 +182,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -180,7 +194,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -191,7 +206,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -202,7 +218,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -213,7 +230,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -224,7 +242,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -235,7 +254,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -246,7 +266,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -257,7 +278,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -268,7 +290,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -279,7 +302,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -290,7 +314,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -301,7 +326,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -312,7 +338,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -323,7 +350,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -334,7 +362,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -345,7 +374,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -356,7 +386,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -367,7 +398,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -378,7 +410,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -389,7 +422,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -400,7 +434,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +446,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -422,7 +458,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -433,7 +470,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -444,7 +482,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -455,7 +494,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -466,7 +506,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -477,7 +518,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -488,7 +530,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -499,7 +542,8 @@ let url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -510,7 +554,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -521,7 +566,8 @@ let url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -532,7 +578,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +590,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -554,7 +602,8 @@ let url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -565,7 +614,8 @@ let url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -576,7 +626,8 @@ let url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; - buildInputs = [pkgconfig libICE xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE xproto ;}; @@ -587,7 +638,8 @@ let url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -598,7 +650,8 @@ let url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -609,7 +662,8 @@ let url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -620,7 +674,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; - buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit applewmproto libX11 libXext xextproto ;}; @@ -631,7 +686,8 @@ let url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; - buildInputs = [pkgconfig fontsproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto xproto xtrans ;}; @@ -642,7 +698,8 @@ let url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; - buildInputs = [pkgconfig xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto xtrans ;}; @@ -653,7 +710,8 @@ let url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; - buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libuuid xproto xtrans ;}; @@ -664,7 +722,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; - buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit windowswmproto libX11 libXext xextproto ;}; @@ -675,7 +734,8 @@ let url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; }; - buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -686,7 +746,8 @@ let url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; - buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; @@ -697,7 +758,8 @@ let url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -708,7 +770,8 @@ let url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -719,7 +782,8 @@ let url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; - buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit compositeproto libX11 libXfixes xproto ;}; @@ -730,7 +794,8 @@ let url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; - buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -741,7 +806,8 @@ let url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; - buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -752,7 +818,8 @@ let url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -763,7 +830,8 @@ let url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; - buildInputs = [pkgconfig libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xextproto xproto ;}; @@ -774,7 +842,8 @@ let url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; }; - buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -785,7 +854,8 @@ let url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -796,7 +866,8 @@ let url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; - buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -807,7 +878,8 @@ let url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; - buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; @@ -818,7 +890,8 @@ let url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -829,7 +902,8 @@ let url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -840,7 +914,8 @@ let url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -851,7 +926,8 @@ let url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; - buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -862,7 +938,8 @@ let url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -873,7 +950,8 @@ let url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; - buildInputs = [pkgconfig presentproto libX11 xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit presentproto libX11 xextproto xproto ;}; @@ -884,7 +962,8 @@ let url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; - buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -895,7 +974,8 @@ let url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; - buildInputs = [pkgconfig renderproto libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit renderproto libX11 xproto ;}; @@ -906,7 +986,8 @@ let url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; - buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; @@ -917,7 +998,8 @@ let url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; - buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -928,7 +1010,8 @@ let url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; - buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; @@ -939,7 +1022,8 @@ let url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -950,7 +1034,8 @@ let url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; - buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; @@ -961,7 +1046,8 @@ let url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -972,7 +1058,8 @@ let url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; @@ -983,7 +1070,8 @@ let url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; - buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; @@ -994,7 +1082,8 @@ let url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; - buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -1005,7 +1094,8 @@ let url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; - buildInputs = [pkgconfig xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto zlib ;}; @@ -1016,7 +1106,8 @@ let url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; - buildInputs = [pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; @@ -1027,7 +1118,8 @@ let url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1038,7 +1130,8 @@ let url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; - buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1049,7 +1142,8 @@ let url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; - buildInputs = [pkgconfig kbproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit kbproto libX11 ;}; @@ -1060,7 +1154,8 @@ let url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1071,7 +1166,8 @@ let url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1082,7 +1178,8 @@ let url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; - buildInputs = [pkgconfig libfontenc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc ;}; @@ -1093,7 +1190,8 @@ let url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1104,7 +1202,8 @@ let url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1115,7 +1214,8 @@ let url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; - buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1126,7 +1226,8 @@ let url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1137,7 +1238,8 @@ let url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; - buildInputs = [pkgconfig libXau ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXau ;}; @@ -1148,7 +1250,8 @@ let url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1159,7 +1262,8 @@ let url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1170,7 +1274,8 @@ let url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1181,7 +1286,8 @@ let url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1192,7 +1298,8 @@ let url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1203,7 +1310,8 @@ let url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; - buildInputs = [pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xproto ;}; @@ -1214,7 +1322,8 @@ let url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -1225,7 +1334,8 @@ let url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; - buildInputs = [pkgconfig libICE libSM libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libXmu libXt ;}; @@ -1236,7 +1346,8 @@ let url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; - buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; @@ -1247,7 +1358,8 @@ let url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1258,7 +1370,8 @@ let url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1269,7 +1382,8 @@ let url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1280,7 +1394,8 @@ let url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; - buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; @@ -1291,7 +1406,8 @@ let url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; - buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXext libXmu xproto ;}; @@ -1302,7 +1418,8 @@ let url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; }; - buildInputs = [pkgconfig libxcb xcbutil ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb xcbutil ;}; @@ -1313,7 +1430,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1324,7 +1442,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; - buildInputs = [pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit python ;}; @@ -1335,7 +1454,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1346,7 +1466,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; @@ -1357,7 +1478,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbproto xproto ;}; @@ -1368,7 +1490,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; - buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xcbutil xproto ;}; @@ -1379,7 +1502,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1390,7 +1514,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1401,7 +1526,8 @@ let url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; - buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit gperf m4 libxcb xproto ;}; @@ -1412,7 +1538,8 @@ let url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; - buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; @@ -1423,7 +1550,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1434,7 +1562,8 @@ let url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; - buildInputs = [pkgconfig libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 ;}; @@ -1445,7 +1574,8 @@ let url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; - buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; @@ -1456,7 +1586,8 @@ let url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; - buildInputs = [pkgconfig libpng libX11 libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpng libX11 libXcursor ;}; @@ -1467,7 +1598,8 @@ let url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; - buildInputs = [pkgconfig libXcursor ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXcursor ;}; @@ -1478,7 +1610,8 @@ let url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; - buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; @@ -1489,7 +1622,8 @@ let url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; - buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; @@ -1500,7 +1634,8 @@ let url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; - buildInputs = [pkgconfig glproto libX11 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit glproto libX11 ;}; @@ -1511,7 +1646,8 @@ let url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr ;}; @@ -1522,7 +1658,8 @@ let url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1533,7 +1670,8 @@ let url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu libXrender libXt ;}; @@ -1544,7 +1682,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1555,7 +1694,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1566,7 +1706,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -1577,7 +1718,8 @@ let url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; - buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1588,7 +1730,8 @@ let url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; - buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1599,7 +1742,8 @@ let url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1610,7 +1754,8 @@ let url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1621,7 +1766,8 @@ let url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; @@ -1632,7 +1778,8 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; - buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1643,7 +1790,8 @@ let url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; - buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto udev randrproto xorgserver xproto ;}; @@ -1654,7 +1802,8 @@ let url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -1665,18 +1814,20 @@ let url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.3.0"; + name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; - sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; + sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; - buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1687,7 +1838,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; @@ -1698,7 +1850,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1709,7 +1862,8 @@ let url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1720,7 +1874,8 @@ let url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1731,7 +1886,8 @@ let url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1742,7 +1898,8 @@ let url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1753,7 +1910,8 @@ let url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1764,7 +1922,8 @@ let url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1775,7 +1934,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; - buildInputs = [pkgconfig xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xextproto xorgserver xproto ;}; @@ -1786,7 +1946,8 @@ let url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; - buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1797,7 +1958,8 @@ let url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1808,18 +1970,20 @@ let url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2017-04-18"; + name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz; - sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; @@ -1830,7 +1994,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1841,7 +2006,8 @@ let url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1852,7 +2018,8 @@ let url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; @@ -1863,7 +2030,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; @@ -1874,7 +2042,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1885,7 +2054,8 @@ let url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1896,7 +2066,8 @@ let url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; @@ -1907,7 +2078,8 @@ let url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1918,7 +2090,8 @@ let url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; @@ -1929,7 +2102,8 @@ let url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1940,7 +2114,8 @@ let url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1951,7 +2126,8 @@ let url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1962,7 +2138,8 @@ let url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; - buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; @@ -1973,7 +2150,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -1984,7 +2162,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; @@ -1995,7 +2174,8 @@ let url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2006,7 +2186,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; @@ -2017,7 +2198,8 @@ let url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; @@ -2028,7 +2210,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2039,7 +2222,8 @@ let url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2050,7 +2234,8 @@ let url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2061,7 +2246,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; - buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto videoproto xorgserver xproto ;}; @@ -2072,7 +2258,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2; sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -2083,7 +2270,8 @@ let url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -2094,7 +2282,8 @@ let url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -2105,7 +2294,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; - buildInputs = [pkgconfig xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit xorgserver xproto ;}; @@ -2116,7 +2306,8 @@ let url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -2127,7 +2318,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2138,7 +2330,8 @@ let url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; - buildInputs = [pkgconfig libXfont xproto xtrans ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXfont xproto xtrans ;}; @@ -2149,7 +2342,8 @@ let url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; - buildInputs = [pkgconfig libX11 xproto libXxf86vm ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXxf86vm ;}; @@ -2160,7 +2354,8 @@ let url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2171,7 +2366,8 @@ let url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; - buildInputs = [pkgconfig libX11 libXau libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXau libXmu xproto ;}; @@ -2182,7 +2378,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2193,7 +2390,8 @@ let url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2; sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2204,7 +2402,8 @@ let url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; - buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -2215,7 +2414,8 @@ let url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2226,7 +2426,8 @@ let url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile ;}; @@ -2237,7 +2438,8 @@ let url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; - buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxkbfile xproto ;}; @@ -2248,7 +2450,8 @@ let url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; - buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto libX11 libXaw xproto libXt ;}; @@ -2259,7 +2462,8 @@ let url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2270,7 +2474,8 @@ let url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2281,7 +2486,8 @@ let url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2292,7 +2498,8 @@ let url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; - buildInputs = [pkgconfig libxcb ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libxcb ;}; @@ -2303,7 +2510,8 @@ let url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2314,7 +2522,8 @@ let url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; - buildInputs = [pkgconfig libX11 libXaw libXmu libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXaw libXmu libXt ;}; @@ -2325,7 +2534,8 @@ let url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; - buildInputs = [pkgconfig libXaw libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libXaw libXt ;}; @@ -2336,7 +2546,8 @@ let url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2347,7 +2558,8 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2358,7 +2570,8 @@ let url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2369,7 +2582,8 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; @@ -2380,7 +2594,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2391,7 +2606,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2402,7 +2618,8 @@ let url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2413,7 +2630,8 @@ let url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2424,7 +2642,8 @@ let url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; - buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXrandr libXrender ;}; @@ -2435,7 +2654,8 @@ let url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; - buildInputs = [pkgconfig libX11 libXmu xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXmu xproto ;}; @@ -2446,7 +2666,8 @@ let url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2457,7 +2678,8 @@ let url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; - buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; @@ -2468,7 +2690,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; - buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; @@ -2479,7 +2702,8 @@ let url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; - buildInputs = [pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; @@ -2490,7 +2714,8 @@ let url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; - buildInputs = [pkgconfig libX11 xproto libXv ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto libXv ;}; @@ -2501,7 +2726,8 @@ let url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; @@ -2512,7 +2738,8 @@ let url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; - buildInputs = [pkgconfig libX11 libxcb xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 libxcb xproto ;}; @@ -2523,7 +2750,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; - buildInputs = [pkgconfig libX11 xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 74c5ae9d9b89..1f3557dff66e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -281,7 +281,8 @@ foreach my $pkg (sort (keys %pkgURLs)) { url = $pkgURLs{$pkg}; sha256 = "$pkgHashes{$pkg}"; }; - buildInputs = [pkgconfig $inputs];$extraAttrs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ $inputs];$extraAttrs meta.platforms = stdenv.lib.platforms.unix; }) // {inherit $inputs;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2f2270d536d2..c3665667107f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -71,13 +71,13 @@ in }; libxcb = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; outputs = [ "out" "dev" "man" "doc" ]; }; xcbproto = attrs : attrs // { - nativeBuildInputs = [ args.python ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; }; libX11 = attrs: attrs // { @@ -398,11 +398,6 @@ in let attrs = with args; if (args.abiCompat == null) then attrs_passed - # All this just for 1.19.2, as the tarball is incorrectly autotoolized. - // { - nativeBuildInputs = [ utilmacros fontutil ]; - preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi"; - } else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; @@ -410,7 +405,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else if (args.abiCompat == "1.18") then { name = "xorg-server-1.18.4"; @@ -419,7 +415,8 @@ in url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; @@ -539,7 +536,7 @@ in }; twm = attrs: attrs // { - nativeBuildInputs = [args.bison args.flex]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; }; xcursorthemes = attrs: attrs // { @@ -565,8 +562,15 @@ in }; xf86videointel = attrs: attrs // { + # the update script only works with released tarballs :-/ + name = "xf86-video-intel-2017-04-18"; + src = args.fetchurl { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" + + "c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz"; + sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; - nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; configureFlags = "--with-default-dri=3 --enable-tools"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8d9b66f21aef..362ca3f2e7e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 060a6b18a897..dfc90feeb33d 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; }; - buildInputs = [ pkgconfig m4 libxcb xcbutil ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ m4 libxcb xcbutil ] ++ stdenv.lib.optional doCheck libX11; doCheck = true; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 25ee9adfd9d9..1a55b06ef367 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -88,20 +88,9 @@ rec { # buildInputs should be built with the usual gcc-wrapper # And the same for propagatedBuildInputs. nativeDrv = stdenv.mkDerivation args; - - # Temporary expression until the cross_renaming, to handle the - # case of pkgconfig given as buildInput, but to be used as - # nativeBuildInput. - hostAsNativeDrv = drv: - builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath - == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; - buildInputsNotNull = stdenv.lib.filter - (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs; - nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { nativeBuildInputs = nativeBuildInputs - ++ nativeInputsFromBuildInputs ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7f750508e8c..a67ca53e1c54 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -77,7 +77,7 @@ in rec { cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; - inherit (last) stdenv; + inherit (last) stdenvNoCC; nativeTools = false; nativeLibc = false; @@ -324,7 +324,7 @@ in rec { shell = "${pkgs.bash}/bin/bash"; cc = lib.callPackageWith {} ../../build-support/cc-wrapper { - inherit (pkgs) stdenv; + inherit (pkgs) stdenvNoCC; inherit shell; nativeTools = false; nativeLibc = false; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index c10d1515a3d5..6ab8bf217269 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -77,7 +77,7 @@ let inherit (localSystem) system; in nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; - inherit (prevStage) stdenv; + stdenvNoCC = prevStage.stdenv; cc = { name = "clang-9.9.9"; cc = "/usr"; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ce8c3ecef829..02da3829c5ae 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,6 +1,10 @@ set -eu set -o pipefail +if (( "${NIX_DEBUG:-0}" >= 6 )); then + set -x +fi + : ${outputs:=out} @@ -269,7 +273,7 @@ for i in $initialPath; do addToSearchPath PATH "$i/bin" done -if [ "${NIX_DEBUG:-}" = 1 ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "initial path: $PATH" fi @@ -429,7 +433,7 @@ fi PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH" -if [ "${NIX_DEBUG:-}" = 1 ]; then +if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "final path: $PATH" fi @@ -539,7 +543,7 @@ substituteAll() { local -a args=() for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do - if [ "${NIX_DEBUG:-}" = "1" ]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then printf "@%s@ -> %q\n" "${varName}" "${!varName}" fi args+=("--subst-var" "$varName") diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e79ec48e9f42..a114ab609e6c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -84,7 +84,7 @@ let libc = prevStage.glibc; inherit (prevStage) binutils coreutils gnugrep; name = name; - stdenv = prevStage.ccWrapperStdenv; + stdenvNoCC = prevStage.ccWrapperStdenv; }; extraAttrs = { @@ -244,7 +244,7 @@ in }; cc = prevStage.gcc-unwrapped; libc = self.glibc; - inherit (self) stdenv binutils coreutils gnugrep; + inherit (self) stdenvNoCC binutils coreutils gnugrep; name = ""; shell = self.bash + "/bin/bash"; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 9ecb56028bc0..558a77281edb 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -117,6 +117,7 @@ in cc = null; fetchurl = null; }; + stdenvNoCC = stdenv; cc = import ../../build-support/cc-wrapper { name = "cc-native"; @@ -126,7 +127,7 @@ in "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; - inherit stdenv; + inherit stdenvNoCC; }; fetchurl = import ../../build-support/fetchurl { diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index c736442dc0a4..ffff8bdf51d4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,5 +1,5 @@ { lib -, crossSystem, config +, crossSystem, config, overlays , bootStages , ... }: @@ -7,9 +7,7 @@ assert crossSystem == null; bootStages ++ [ - (prevStage: let - inherit (prevStage) stdenv; - in { + (prevStage: { inherit config overlays; stdenv = import ../generic rec { @@ -27,10 +25,9 @@ bootStages ++ [ cc = import ../../build-support/cc-wrapper { nativeTools = false; - nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; + nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; - inherit stdenv; - inherit (prevStage) binutils coreutils gnugrep; + inherit (prevStage) stdenvNoCC binutils coreutils gnugrep; cc = prevStage.gcc.cc; isGNU = true; shell = prevStage.bash + "/bin/sh"; @@ -38,7 +35,7 @@ bootStages ++ [ shell = prevStage.bash + "/bin/sh"; - fetchurlBoot = stdenv.fetchurlBoot; + fetchurlBoot = prevStage.stdenv.fetchurlBoot; overrides = self: super: { inherit cc; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 3dfc7abbc77d..232c4a636fb8 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "03vdbmqlbmk3j2ay1wy6snrm2y27faxz7qv81vyzjzngj345095a"; }; - buildInputs = [ gtk pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 9de29da9b44a..5baf6a4b51f8 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; }; - buildInputs = [ autoconf automake imlib2 libtool libX11 pkgconfig xproto ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake imlib2 libtool libX11 xproto ]; patches = [ underlinkingPatch ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index edddf42d2c55..23e528297eef 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5"; }; - buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 xextproto libXtst libXi libXext libXinerama glib cairo xdotool ]; patchPhase = '' diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index a753f9bd170e..cd80e3286576 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -3,8 +3,9 @@ stdenv.mkDerivation rec { name = "ksuperkey-git-2015-07-21"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libX11 libXtst pkgconfig inputproto libXi xproto xextproto + libX11 libXtst inputproto libXi xproto xextproto ]; src = fetchgit { diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index e25fa43f1807..2e02338631b4 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 libglade libSM openbox imlib2 libstartup_notification + gtk2 libglade libSM openbox imlib2 libstartup_notification makeWrapper ]; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 7a18a6a98b60..a20b7d69f3dc 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; - buildInputs = [ pkgconfig libvdpau ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvdpau ]; meta = with stdenv.lib; { homepage = http://people.freedesktop.org/~aplattner/vdpau/; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 2e23e7bd4de4..e0118b8b27b4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - buildInputs = [ libX11 libXmu glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index cef071bb3b61..e3d9ecd5953e 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "xbindkeys-config-${version}"; version = "0.1.3"; - buildInputs = [ gtk pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk makeWrapper ]; src = fetchurl { url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz"; diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9b50f00beefc..8376b2041b30 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index aa0ae36fdd29..00f28c2c7bab 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -18,8 +18,9 @@ in buildPythonApplication rec { sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cython pkgconfig + cython xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index f66b7389f315..92f1827156b6 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -19,9 +19,8 @@ buildPythonApplication rec { substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h' ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig - xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 2bd6392456ee..76e502d75985 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index c05aeff9337c..239b01e1345d 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { ./SConstruct.patch ]; - buildInputs = [ libX11 scons pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 scons ]; buildPhase = '' mkdir -p "$out" scons \ diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index 35342035c9d5..1905ed9752ca 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi"; }; - buildInputs = [ libX11 makeWrapper autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 makeWrapper ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 40956f2acc4d..e36808db0b8c 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchgit, gtk2, cmake, pkgconfig}: -let - buildInputs = [ - gtk2 cmake pkgconfig - ]; -in +{ stdenv, fetchgit, gtk2, cmake, pkgconfig }: + stdenv.mkDerivation rec { version = "0.4.2"; name = "xwinmosaic-${version}"; - inherit buildInputs; + src = fetchgit { url = "https://github.com/soulthreads/xwinmosaic/"; rev = "refs/tags/v0.4.2"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ gtk2 ]; + meta = { inherit version; description = ''X window switcher drawing a colourful grid''; diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/tools/admin/fastlane/Gemfile new file mode 100644 index 000000000000..1fa8dbca63b1 --- /dev/null +++ b/pkgs/tools/admin/fastlane/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'fastlane' diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock new file mode 100644 index 000000000000..5f15a9d0455c --- /dev/null +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -0,0 +1,139 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + babosa (1.0.2) + claide (1.0.2) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.5) + highline (~> 1.7.2) + declarative (0.0.10) + declarative-option (0.1.0) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.2.1) + excon (0.59.0) + faraday (0.13.1) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + fastimage (2.1.0) + fastlane (2.60.1) + CFPropertyList (>= 2.3, < 3.0.0) + addressable (>= 2.3, < 3.0.0) + babosa (>= 1.0.2, < 2.0.0) + bundler (>= 1.12.0, < 2.0.0) + colored + commander-fastlane (>= 4.4.5, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + excon (>= 0.45.0, < 1.0.0) + faraday (~> 0.9) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 0.9) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.0.1, < 2.0.0) + google-api-client (>= 0.13.1, < 0.14.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + mini_magick (~> 4.5.1) + multi_json + multi_xml (~> 0.5) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + public_suffix (~> 2.0.0) + rubyzip (>= 1.1.0, < 2.0.0) + security (= 0.1.3) + slack-notifier (>= 1.3, < 2.0.0) + terminal-notifier (>= 1.6.2, < 2.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (~> 0.5.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.5.0, < 2.0.0) + xcpretty (>= 0.2.4, < 1.0.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.0.3) + google-api-client (0.13.6) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.5) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + googleauth (0.5.3) + faraday (~> 0.12) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + highline (1.7.8) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + json (2.1.0) + jwt (1.5.6) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + memoist (0.16.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_magick (4.5.1) + multi_json (1.12.2) + multi_xml (0.6.0) + multipart-post (2.0.0) + nanaimo (0.2.3) + os (0.9.6) + plist (3.3.0) + public_suffix (2.0.5) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.1) + rouge (2.0.7) + rubyzip (1.2.1) + security (0.1.3) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) + slack-notifier (1.5.1) + terminal-notifier (1.8.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-screen (0.5.0) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) + word_wrap (1.0.0) + xcodeproj (1.5.2) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + xcpretty (0.2.8) + rouge (~> 2.0.7) + xcpretty-travis-formatter (0.0.4) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + fastlane + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix new file mode 100644 index 000000000000..b9008c919bf3 --- /dev/null +++ b/pkgs/tools/admin/fastlane/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "fastlane"; + gemdir = ./.; + + meta = with lib; { + description = "A tool to automate building and releasing iOS and Android apps"; + longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; + homepage = https://github.com/fastlane/fastlane; + license = licenses.mit; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix new file mode 100644 index 000000000000..0d9c1f55835d --- /dev/null +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -0,0 +1,469 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + babosa = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; + type = "gem"; + }; + version = "1.0.2"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x"; + type = "gem"; + }; + version = "2.3.5"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + commander-fastlane = { + dependencies = ["highline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04gpg733wv878acvrzp4kc3k934v10l3v8bcz3fjq5imjsrjdnbp"; + type = "gem"; + }; + version = "4.4.5"; + }; + declarative = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + type = "gem"; + }; + version = "0.0.10"; + }; + declarative-option = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + type = "gem"; + }; + version = "0.5.20170404"; + }; + dotenv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; + }; + excon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40"; + type = "gem"; + }; + version = "0.59.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + type = "gem"; + }; + version = "0.13.1"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + type = "gem"; + }; + version = "0.0.6"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + type = "gem"; + }; + version = "0.12.2"; + }; + fastimage = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh80nwjxm63phcdg55haz9q877fxgvnkazjihaqbf8ginn6g00v"; + type = "gem"; + }; + version = "2.1.0"; + }; + fastlane = { + dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sg8xh1rjigiq438knkpdq685kyw34ki3h7baj65qh9mkkc8drxy"; + type = "gem"; + }; + version = "2.60.1"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + type = "gem"; + }; + version = "0.13.6"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + type = "gem"; + }; + version = "0.5.3"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + type = "gem"; + }; + version = "1.7.8"; + }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + jwt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + type = "gem"; + }; + version = "1.5.6"; + }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + type = "gem"; + }; + version = "0.16.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + type = "gem"; + }; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; + }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a59k5l29vj060yscaqk370rg5vyr132kbw6x3zar7khzjqjqd8p"; + type = "gem"; + }; + version = "4.5.1"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + type = "gem"; + }; + version = "1.12.2"; + }; + multi_xml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; + plist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc"; + type = "gem"; + }; + version = "3.3.0"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; + type = "gem"; + }; + version = "3.1.1"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + type = "gem"; + }; + version = "1.2.1"; + }; + security = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + type = "gem"; + }; + version = "0.1.3"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + type = "gem"; + }; + version = "0.7.3"; + }; + slack-notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; + type = "gem"; + }; + version = "1.5.1"; + }; + terminal-notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vy75sbq236v1p83jj6r3a9d52za5lqj2vj24np9lrszdczm9zcb"; + type = "gem"; + }; + version = "1.8.0"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + tty-screen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3"; + type = "gem"; + }; + version = "0.5.0"; + }; + uber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + type = "gem"; + }; + version = "1.3.0"; + }; + word_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm"; + type = "gem"; + }; + version = "1.0.0"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51"; + type = "gem"; + }; + version = "1.5.2"; + }; + xcpretty = { + dependencies = ["rouge"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b8x9m53a1hbw0lamffjm4m1ydigj3azl97jc5w7prv1bm27s2y3"; + type = "gem"; + }; + version = "0.2.8"; + }; + xcpretty-travis-formatter = { + dependencies = ["xcpretty"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2"; + type = "gem"; + }; + version = "0.0.4"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index da269049b2ca..59a5ec8d4dad 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,11 +15,13 @@ in stdenv.mkDerivation rec { sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python gnutls cairo libtool pkgconfig glib libffi libgcrypt + python gnutls cairo libtool glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - gtk3 vala_0_32 pygobject3 ]; + gtk3 vala_0_32 pygobject3 + ]; NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 042880b39c9b..00de2c2ec462 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [ pkgconfig fuse perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse perl ]; meta = { description = "FUSE Compressed ROM filesystem with lzma"; diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index 1ed453f0d4f8..f99ee963dbe6 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { version = "1.4"; name = "runzip-${version}"; - buildInputs = [ libzip autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libzip ]; src = fetchFromGitHub { owner = "vlm"; diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 0cb4fbbf3f03..07e76ea7f62a 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; - buildInputs = [ gtk2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 6ed6a7f24021..a257ece48773 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; }; - buildInputs = [ gtk2 pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 intltool ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index ba029814f392..f68671bc6fba 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; - buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake qt4 taglib chromaprint ffmpeg ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 7354b92aaf94..8fed569f140f 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index c326533ece14..6596f1c34ff5 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { intltoolize -f ''; - buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ intltool pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; postInstall = "wrapPythonPrograms"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6e3e5617b311..239e4b3fcca3 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev + gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev ]; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 451424fb8661..02235f727c5c 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h"; }; - buildInputs = [ autoconf automake makeWrapper pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake makeWrapper gnome3.defaultIconTheme avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 38df702cb16e..b04e449835d4 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which autoconf automake libtool gnome2.gtkdoc glib pkgconfig + which autoconf automake libtool gnome2.gtkdoc glib gobjectIntrospection ]; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index ea74d83ed9e2..ed9558762502 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; }; - buildInputs = [ gtk3 pkgconfig intltool alsaLib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 intltool alsaLib ]; meta = with stdenv.lib; { description = "A lightweight volume control that sits in your systray"; diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index abfccb97641c..754e12e7f776 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -10,7 +10,8 @@ let url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; }; - buildInputs = with python3Packages; [ pytest pkgconfig fuse attr which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with python3Packages; [ pytest fuse attr which ]; propagatedBuildInputs = with python3Packages; [ contextlib2 ]; checkPhase = '' py.test diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ff542e781a69..f9feaf40ec2f 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.24.0"; + version = "0.25.1"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3"; + sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; }; patches = [ diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 313167b1ae27..d55783f7f2ce 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna + boto cffi cryptography ecdsa enum idna pygobject3 ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index b0b9444a2380..c902802abce2 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { }; configureFlags = "--with-ssl-headers=${openssl.dev}/include/openssl"; - buildInputs = [bzip2 zlib newt newt openssl pkgconfig slang + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [bzip2 zlib newt newt openssl slang # automake autoconf libtool gettext ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 35f46b47bc83..53a193749d3c 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 95dd58a59b48..3b8040e2b917 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { makeFlags = "RM=rm LN=ln MV=mv"; - buildInputs = [ lame libvorbis libmad pkgconfig libao ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lame libvorbis libmad libao ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index a345972b3737..fe7a1a044149 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; - buildInputs = [ cmake libtiff pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libtiff ]; propagatedBuildInputs = [ tesseract ]; meta = { diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b91a59006e94..8f2577c43442 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: +{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: stdenv.mkDerivation rec { name = "xorriso-1.4.8"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ libcdio zlib bzip2 readline attr ] - ++ stdenv.lib.optional stdenv.isLinux acl; + buildInputs = [ libcdio zlib bzip2 readline libiconv ] + ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; meta = with stdenv.lib; { description = "ISO 9660 Rock Ridge file system manipulator"; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 5ce79cbf4128..2a5250a95aca 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { version = "1.0.6"; name = "${baseName}-${version}"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig asciidoc libxslt libxml2 + autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xml_xslt libarchive lzma ]; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index dff66fe6bde5..f4133f12541f 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; - buildInputs = [ pkgconfig fuse libarchive ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse libarchive ]; meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 61c7f26db1e1..efd48fb87fe7 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; - buildInputs = [ pkgconfig utillinux ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ utillinux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need # anyway (it's distro specific stuff). diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 5c5779037ab2..fc4d3f505cdc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; }; - buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; preConfigure = '' substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 80027c7a0474..4d7ee75c0060 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { dontStrip = true; - buildInputs = [ fuse pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix deleted file mode 100644 index afafa4ec1743..000000000000 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt -}: - -let version = "4.4.1"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; - }; - - buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # gcc bug with -O1 on ARM with gcc 4.8 - # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ nckx raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d9b01eb5239f..77411e0cc26d 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,18 +2,19 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.13.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo + attr acl zlib libuuid e2fsprogs lzo asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 674f462b967f..4a8c767e44ac 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; - buildInputs = [ pkgconfig fuse glib attr ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse glib attr ]; makeFlags = "DESTDIR=$(out) PREFIX="; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 1897181e4448..8797c21aa235 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; - buildInputs = [fuse curl pkgconfig glib zlib]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [fuse curl glib zlib]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 7010a60bcbc0..e8deeaf4b470 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; - buildInputs = [ pkgconfig fuse]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse]; meta = { homepage = http://djmount.sourceforge.net/; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index d333334d394c..613ab7bab1ee 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1fll0xjg1p3pabgjiddild4ragk9spbdmdzrkq0hv5pxb1qrv7lp"; }; - buildInputs = [ libgcrypt pkgconfig glib linuxHeaders sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 8b3df52bcb74..82e2b404b82a 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - buildInputs = [ fuse autoconf automake pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse autoconf automake makeWrapper ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 7165789cf81c..3ca468513063 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - buildInputs = [ pkgconfig fuse zlib glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse zlib glib ]; patches = let fetchPatchFromDebian = { patch, sha256 }: fetchpatch { diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b808573aa5b8..792b2e2c75b4 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; - buildInputs = [ pkgconfig libconfuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libconfuse ]; postInstall = '' # As there is no manpage or built-in --help, add the README file for diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix index c156cd13244a..b9314015cf55 100644 --- a/pkgs/tools/filesystems/gocrypfs/default.nix +++ b/pkgs/tools/filesystems/gocrypfs/default.nix @@ -21,7 +21,8 @@ in buildGoPackage rec { sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z"; }; - buildInputs = [pkgconfig openssl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl]; goDeps = ./deps.nix; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 88922d9ce944..e9d3df026b08 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; }; - buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ curl openssl fuse libxml2 json_c file ]; postInstall = '' install hubic_token $out/bin mkdir -p $out/sbin diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 091270deab66..6044806a34b7 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { owner = "JasonFerrara"; }; - buildInputs = [ file fuse libmtp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ file fuse libmtp ]; meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 54a8f8459152..697256982bbf 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; - buildInputs = [ fuse pkgconfig attr uthash ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse attr uthash ]; patches = [ ./fix-format-security-error.patch diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 7725b0d7af8e..6d2b073d8696 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { name = "mtpfs-1.1"; - buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse libmtp glib libid3tag libmad ]; # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs preConfigure = '' diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 0214afce6d45..445e724e1a2a 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec{ sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174"; }; - buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl acl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; patches = ./omitLocalstatedirCreation.patch; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index c612512b8cc9..24eec2f0dc46 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ devicemapper libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 6301cbb6842a..df14d7efda4e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; - buildInputs = [ pkgconfig systemd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index 0d3370c4b1e8..fd6c5b913093 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { PATH="${parted}/sbin:$PATH" ''; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ parted ]; diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 0c8e1c4ef81a..9a8c3ecb0fc8 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3"; }; - buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs pkgconfig GConf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ]; buildPhase = '' cd deps diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 3bc13d43a362..fc504b3208de 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16sikr81ipn8v1a1zrqgnsy2as3zcaxbzkr0bm5vxy012bq0plkd"; }; - buildInputs = [ fuse samba pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse samba glib ]; meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index ccb20e9f1bd0..c9f605ca69f0 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = { homepage = http://www.snapraid.it/; diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix new file mode 100644 index 000000000000..65eafe76710d --- /dev/null +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "u3-tool"; + version = "0.3"; + name = "${pname}-${version}"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; + }; + + meta = with stdenv.lib; { + description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; + homepage = https://sourceforge.net/projects/u3-tool/ ; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index a51f2d47172e..dc725b5078f0 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; - buildInputs = [fuse glib neon pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [fuse glib neon]; meta = { homepage = http://noedler.de/projekte/wdfs/; description = "User-space filesystem that allows to mount a webdav share"; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 0738ee84cab7..9dfb2deeaee3 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; - buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zookeeper_mt log4cxx boost fuse ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 3e4e3e9312ed..bb816e489404 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -9,13 +9,14 @@ let url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libdmtx pkgconfig imagemagick + libdmtx imagemagick ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 86848f958838..91dd85b0757d 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45"; }; - buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt libXaw libXres utilmacros ]; configureFlags = "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres"; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 2534a9cbefac..537d1a8c7db9 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - buildInputs = [ pkgconfig libexif popt ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libexif popt ] ++ libintlOrEmpty; meta = { homepage = http://libexif.sourceforge.net/; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index e7fb3e773c1d..071c8f360792 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; }; - buildInputs = [ pkgconfig libxml2 gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 gtk2 ]; configureFlags = "--with-all-plugins"; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index e37ebb50bf73..0d31f8f1a6f7 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev ]; buildPhase = '' diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 6100573153ba..10170b41bbe4 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.6"; + name = "gnuplot-5.2.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"; + sha256 = "0hqyajcnlk822fk7hyl07sqk6a75n93awbdl3ydk9fd6l4jn9zkx"; }; buildInputs = diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 376d1bc134df..7261326633a1 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake autoreconfHook pkgconfig + autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core dbus libdbusmenu-glib diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 333b0f95b722..d1b31f391526 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1k6n758r9dhjmc1pnpk6qzpg0q7pkq2hf18z3b0s2z198jpkg9s3"; }; - buildInputs = [ pkgconfig poppler ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ poppler ]; installFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index f7f9211b5154..abebc0fc4ca6 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; }; - buildInputs = [ glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa boost + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost glm freetype ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index dad611868bc2..058900b8e237 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ cairo poppler gtk2 ]; meta = with stdenv.lib; { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index 5676b37042d1..e01f3ea2acc5 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; - buildInputs = [ pkgconfig libpng zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng zlib ]; patchPhase = '' sed -i '/png.h/a \#include <zlib.h>' src/rwpng.c diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 78a2a7cb695e..93f57f95e3e2 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; - buildInputs = [ pkgconfig libpng zlib lcms2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng zlib lcms2 ]; meta = with stdenv.lib; { homepage = https://pngquant.org/; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index a801dd8ebda9..caff97f0e32a 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -10,8 +10,9 @@ let rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL_gfx libjpeg pkgconfig libpng + SDL SDL_gfx libjpeg libpng ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 2b64cbcc1f58..b58114a61a5d 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; }; - buildInputs = [ pkgconfig libav libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libav libxslt ]; meta = with stdenv.lib; { homepage = https://www.flameeyes.eu/projects/unpaper; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 9d8427e533cb..7f09b488c289 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8"; }; - buildInputs = [ cmake fcitx anthy gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx anthy gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index 58695434cb6c..361355d1d688 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs"; }; - buildInputs = [ cmake fcitx gettext libchewing pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext libchewing ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index acd377441e2c..ebb6627dccae 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1"; }; - buildInputs = [ cmake pkgconfig fcitx gettext curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext curl ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 54b5335d9bb2..41560227bca0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp"; }; - buildInputs = [ cmake fcitx libhangul gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx libhangul gettext ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index c441a4964b82..6022bcebc3b2 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn"; }; - buildInputs = [ cmake pkgconfig fcitx gettext libpinyin glib pcre dbus qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext libpinyin glib pcre dbus qt4 ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index ff42bbbbcc8e..c0c921f7b18d 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4"; }; - buildInputs = [ cmake fcitx gettext m17n_lib m17n_db pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext m17n_lib m17n_db ]; preInstall = '' substituteInPlace im/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix new file mode 100644 index 000000000000..e9e2e29f7fad --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "fcitx-rime-${version}"; + version = "0.3.2"; + + src = fetchurl { + url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz"; + sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; + }; + + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + + # cmake cannont automatically find our nonstandard brise install location + cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; + + preInstall = '' + substituteInPlace src/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace data/cmake_install.cmake \ + --replace ${fcitx} $out + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + isFcitxEngine = true; + homepage = https://github.com/fcitx/fcitx-rime; + downloadPage = https://download.fcitx-im.org/fcitx-rime/; + description = "Rime support for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ sifmelcara ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 4581f80a75e0..ddfa41dda318 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; - buildInputs = [ cmake fcitx gettext pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake fcitx gettext ]; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 830342222617..b5b394c5b6cb 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; - buildInputs = [ makeWrapper fcitx cmake isocodes pkgconfig gtk3 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 gnome3.defaultIconTheme ]; preFixup = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index f3e3973a2c3f..328c803e7dbc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx"; }; - buildInputs = [ ibus ibus-table pkgconfig python3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ibus ibus-table python3 ]; preBuild = '' export HOME=$(mktemp -d)/ibus-table-others diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3b076bb8ff6c..69ac0ad3ef68 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -50,6 +50,12 @@ let }; pyEnv = python3.buildEnv.override { extraLibs = [ python3.pkgs.pygobject3 ]; + + # ImportError: No module named site + postBuild = '' + makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \ + --unset PYTHONPATH + ''; }; in stdenv.mkDerivation rec { name = "ibus-${version}"; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 95c32532e407..8d02d4edde8e 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - ibus cmake pkgconfig qt4 icu doxygen + ibus cmake qt4 icu doxygen ]; cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index cb33abc3213d..7ca5af555f96 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - buildInputs = [ gtk2 libhangul pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libhangul ]; meta = with stdenv.lib; { description = "The Easy Hangul XIM"; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index cdb5abcf453c..54c78874dd2e 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; }; - buildInputs = [ pkgconfig autoconf automake m4 intltool glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake m4 intltool glib libsoup gdk_pixbuf ]; configureScript = "./autogen.sh"; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 29b199e5866b..9a09fba93e69 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; }; - buildInputs = [ libusb1 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; configurePhase = '' cd commandline diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix new file mode 100644 index 000000000000..7937a212951f --- /dev/null +++ b/pkgs/tools/misc/bonfire/default.nix @@ -0,0 +1,44 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +with python3Packages; + +buildPythonApplication rec { + version = "2017-01-19"; + pname = "bonfire"; + name = "${pname}-unstable-${version}"; + + # use latest git version with --endpoint flag + # https://github.com/blue-yonder/bonfire/pull/18 + src = fetchFromGitHub { + owner = "blue-yonder"; + repo = "${pname}"; + rev = "d0af9ca10394f366cfa3c60f0741f1f0918011c2"; + sha256 = "193zcvzbhxwwkwbgmnlihhhazwkajycxf4r71jz1m12w301sjhq5"; + }; + + postPatch = '' + # https://github.com/blue-yonder/bonfire/pull/24 + substituteInPlace requirements.txt \ + --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.11" \ + --replace "keyring>=9,<10" "keyring>=9,<11" + # pip fails when encountering the git hash for the package version + substituteInPlace setup.py \ + --replace "version=version," "version='${version}'," + # remove extraneous files + substituteInPlace setup.cfg \ + --replace "data_files = *.rst, *.txt" "" + ''; + + buildInputs = [ httpretty pytest pytestcov ]; + + propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/bonfire; + description = "CLI Graylog Client with Follow Mode"; + license = licenses.bsd3; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index af9861ea6ed5..ea1ac6d116b1 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - buildInputs = [ pkgconfig bluez ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index af518e7efa98..9894813d9556 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: +{ stdenv, fetchurl, makeWrapper +, gawk, gnused, utillinux, file +, wget, python3, qemu, euca2ools +, e2fsprogs, cdrkit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops - name = "cloud-utils-0.29"; + # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix + name = "cloud-utils-${version}"; + version = "0.30"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; - sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; + url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; + sha256 = "19ca9ckwwsvlqrjz19bc93rq4gv3y4ak7551li2qk95caqyxsq3k"; }; - buildInputs = [ makeWrapper ]; - buildPhase = '' - mkdir -p $out/bin - cp bin/growpart $out/bin/growpart - sed -i 's|awk|gawk|' $out/bin/growpart - sed -i 's|sed|gnused|' $out/bin/growpart - ln -s sed $out/bin/gnused - wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + installFlags = [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/bin" "MANDIR=$(out)/man/man1" "DOCDIR=$(out)/doc" ]; + + # according to https://packages.ubuntu.com/source/zesty/cloud-utils + binDeps = [ + wget e2fsprogs file gnused gawk utillinux qemu euca2ools cdrkit + ]; + + postFixup = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" + done ''; - dontInstall = true; - dontPatchShebangs = true; - dontStrip = true; - meta = { - platforms = stdenv.lib.platforms.unix; - }; + dontBuild = true; + + meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch b/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch deleted file mode 100644 index c782c2d7e4bd..000000000000 --- a/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1895d10a7539d055a4e0206af1e7a9e5ea32a4f7 Mon Sep 17 00:00:00 2001 -From: Juerg Haefliger <juerg.haefliger@hp.com> -Date: Wed, 25 Mar 2015 13:59:20 +0100 -Subject: [PATCH] Support new sfdisk version 2.26 - -The sfdisk usage with version 2.26 changed. Specifically, the option ---show-pt-geometry and functionality for CHS have been removed. -Also, restoring a backup MBR now needs to be done using dd. ---- - bin/growpart | 28 ++++++++++------------------ - 1 file changed, 10 insertions(+), 18 deletions(-) - -diff --git a/bin/growpart b/bin/growpart -index 595c40b..d4c995b 100755 ---- a/bin/growpart -+++ b/bin/growpart -@@ -28,7 +28,6 @@ PART="" - PT_UPDATE=false - DRY_RUN=0 - --MBR_CHS="" - MBR_BACKUP="" - GPT_BACKUP="" - _capture="" -@@ -133,7 +132,8 @@ bad_Usage() { - } - - mbr_restore() { -- sfdisk --no-reread "${DISK}" ${MBR_CHS} -I "${MBR_BACKUP}" -+ dd if="${MBR_BACKUP}-${DISK#/dev/}-0x00000000.bak" of="${DISK}" bs=1 \ -+ conv=notrunc - } - - sfdisk_worked_but_blkrrpart_failed() { -@@ -148,34 +148,26 @@ sfdisk_worked_but_blkrrpart_failed() { - - mbr_resize() { - RESTORE_HUMAN="${TEMP_D}/recovery" -- MBR_BACKUP="${TEMP_D}/orig.save" -+ MBR_BACKUP="${TEMP_D}/backup" - - local change_out=${TEMP_D}/change.out - local dump_out=${TEMP_D}/dump.out - local new_out=${TEMP_D}/new.out - local dump_mod=${TEMP_D}/dump.mod -- local tmp="${TEMP_D}/tmp.out" -- local err="${TEMP_D}/err.out" - -- local _devc cyl _w1 heads _w2 sectors _w3 tot dpart -+ local tot dpart - local pt_start pt_size pt_end max_end new_size change_info - -- # --show-pt-geometry outputs something like -- # /dev/sda: 164352 cylinders, 4 heads, 32 sectors/track -- rqe sfd_geom sfdisk "${DISK}" --show-pt-geometry >"${tmp}" && -- read _devc cyl _w1 heads _w2 sectors _w3 <"${tmp}" && -- MBR_CHS="-C ${cyl} -H ${heads} -S ${sectors}" || -- fail "failed to get CHS from ${DISK}" -+ tot=$(sfdisk --list "${DISK}" | awk '{ print $(NF-1) ; exit }') || -+ fail "failed to get total number of sectors from ${DISK}" - -- tot=$((${cyl}*${heads}*${sectors})) -+ debug 1 "total number of sectors of ${DISK} is ${tot}" - -- debug 1 "geometry is ${MBR_CHS}. total size=${tot}" -- rqe sfd_dump sfdisk ${MBR_CHS} --unit=S --dump "${DISK}" \ -+ rqe sfd_dump sfdisk --dump "${DISK}" \ - >"${dump_out}" || - fail "failed to dump sfdisk info for ${DISK}" -- - { -- echo "## sfdisk ${MBR_CHS} --unit=S --dump ${DISK}" -+ echo "## sfdisk --dump ${DISK}" - cat "${dump_out}" - } >"${RESTORE_HUMAN}" - [ $? -eq 0 ] || fail "failed to save sfdisk -d output" -@@ -237,7 +229,7 @@ mbr_resize() { - exit 0 - fi - -- LANG=C sfdisk --no-reread "${DISK}" ${MBR_CHS} --force \ -+ LANG=C sfdisk --no-reread "${DISK}" --force \ - -O "${MBR_BACKUP}" <"${new_out}" >"${change_out}" 2>&1 - ret=$? - [ $ret -eq 0 ] || RESTORE_FUNC="mbr_restore" --- -2.1.4 - diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 96022d01ef7d..c26f835c0ee5 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; - buildInputs = [ intltool colord glib gtk3 pkgconfig lcms2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool colord glib gtk3 lcms2 ]; meta = { homepage = http://www.freedesktop.org/software/colord/intro.html; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 46f3786a6df3..40ea672296d8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; }; - nativeBuildInputs = [ autoreconfHook intltool ]; enableParallelBuilding = true; @@ -34,7 +33,9 @@ stdenv.mkDerivation rec { sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; - buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + + buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bash-completion argyllcms libgudev sane-backends ]; postInstall = '' diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index dfa6bf71bb44..6bbf049d2445 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "CUnit-${version}"; version = "2.1-3"; - buildInputs = [autoconf automake libtool autoreconfHook]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [autoconf automake libtool]; src = fetchurl { url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index b6f483fb4efd..8dcaecf9851c 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig glib procps libxml2 + glib procps libxml2 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 039ec27947af..e5e3815481f1 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; - buildInputs = [ pkgconfig glib libintlOrEmpty ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libintlOrEmpty ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1606fffe397b..cfad499a432b 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.12.2"; + version = "2.13.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b"; + sha256 = "1j2jkxzd6rh4ms39izqfm4w8h12dg0ccvqsj0z1z4hb3f1jqcgbz"; }; postConfigure = '' @@ -42,7 +42,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = http://direnv.net; + homepage = https://direnv.net; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 06862a634238..7e98b7d64d2d 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif"; }; - buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ tokyocabinet cairo pango ncurses ]; meta = with stdenv.lib; { homepage = http://duc.zevv.nl/; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index f773ae6caac5..b44159be8ce8 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.w3.org/Tools/eot-utils/; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 110125727bf0..488f7482b154 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -2,34 +2,17 @@ with rustPlatform; -let - # check for updates - zoneinfo_compiled = fetchFromGitHub { - owner = "rust-datetime"; - repo = "zoneinfo-compiled"; - rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f"; - sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26"; - }; - cargoPatch = '' - # use non-git dependencies - patch Cargo.toml <<EOF - 46c46 - < git = "https://github.com/rust-datetime/zoneinfo-compiled.git" - --- - > path = "${zoneinfo_compiled}" - EOF - ''; -in buildRustPackage rec { +buildRustPackage rec { name = "exa-${version}"; - version = "0.7.0"; + version = "0.8.0"; - depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; + depsSha256 = "0yz41prkjs5rmvdhr9k58a52l7hvwy5mfg8rcpsq4ybgf601lja2"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; + sha256 = "0jy11a3xfnfnmyw1kjmv4ffavhijs8c940kw24vafklnacx5n88m"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; @@ -38,15 +21,6 @@ in buildRustPackage rec { # Some tests fail, but Travis ensures a proper build doCheck = false; - cargoUpdateHook = '' - ${cargoPatch} - ''; - cargoDepsHook = '' - pushd $sourceRoot - ${cargoPatch} - popd - ''; - meta = with stdenv.lib; { description = "Replacement for 'ls' written in Rust"; longDescription = '' @@ -57,7 +31,7 @@ in buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = http://the.exa.website; + homepage = https://the.exa.website; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; }; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index c46566aeabe5..07d8a661d7b7 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0sv7iwl44a86n92i3mib2vlzd44q9ncif34yh1s0vqffai5s1rr6"; + sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; }; - depsSha256 = "1irfx78k899qphzj8i8vr34pb6zaf9p5nx5c4zpgsrbknvn0ag5l"; + depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g"; meta = { description = "A simple, fast and user-friendly alternative to find"; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ee7854c539ed..c7fd29da8ac4 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 1ba4bceb7876..6307d012debd 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - buildInputs = [ pkgconfig freetype gtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 424a84637a53..8586244b4152 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig geoipWithDatabase ncurses glib diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a690ef2084b2..bb565bacfe79 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # autoreconfHook required for the splashimage patch. - buildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ texinfo ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index f362e7c53a24..d4322f051d0a 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ smartmontools gtkmm2 libglademm pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/misc/kalibrate-rtl/default.nix b/pkgs/tools/misc/kalibrate-rtl/default.nix index 19870b8de5b8..19ebd05e23c1 100644 --- a/pkgs/tools/misc/kalibrate-rtl/default.nix +++ b/pkgs/tools/misc/kalibrate-rtl/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - buildInputs = [ autoreconfHook pkgconfig fftw rtl-sdr libusb1 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with stdenv.lib; { description = "Calculate local oscillator frequency offset in RTL-SDR devices"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index d96409809a6e..72c9cecf5406 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' cd ldapvi diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 1f45626855f5..989c1f57b6ef 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1g79hl6jmf5dam7vq19h4dgdj7gcn19fa7q78vn573mg2rdyal53"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libsodium czmqpp libbitcoin ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fbfa385fc7fc..7b6da9bdd3ed 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "00123vw7rxk0ypdfzk0xwk8q55ll31000mkjqdzl915krsbkbfvp"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ libbitcoin-client ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 61c462f7853f..6d0c7b4e9c95 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy"; }; - buildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 136951cb7bc5..5ab05c92135a 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; version = "0.8.2"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 0828fea81e1c..fb4093d89b86 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; }; - buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 165780a5fa19..acb3bd9d3773 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }; - buildInputs = [glib readline bison flex pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [glib readline bison flex]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 4f76306ab5f9..6289c35f35a7 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib readline bison flex autoreconfHook pkgconfig which txt2man + glib readline bison flex autoreconfHook which txt2man gnome_doc_utils scrollkeeper libiconv ]; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 1acdf6d7ddb8..56684848ebaa 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -10,12 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; - buildInputs = [ mpd_clientlib curl glib pkgconfig ]; - - preConfigure = '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} - export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} - ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mpd_clientlib curl glib ]; meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 9a435622c7d7..2aea2530057c 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { unpackCmd = "unzip -d src -q $curSrc"; - buildInputs = [ unzip pkgconfig curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unzip curl ]; patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index f92069e7b9f5..267b458cccc6 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { makeFlags = "prefix=$(out)"; - buildInputs = [ glib gettext readline pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index f15c452c9550..447ef9dd5ec5 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8047"; + version = "1.2017.18"; name = "plantuml-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "11a1qchalymvc7qn9kqxamp8qm8fljpnxmfi4zs8sg75nzddjnlm"; + url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; + sha256 = "0ssfg6lpk41ydhxhi6y6c9ca3hpql6gg3bxjws8vrx9s3s6r5rb0"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 663c60d28569..6a5e674b698b 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - buildInputs = [ pkgconfig libX11 libXtst qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXtst qt4 ]; patchPhase = '' cd src substituteInPlace config --replace /bin/bash /bin/sh diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 54e5a3ab17e0..07c14ac76267 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s"; }; - buildInputs = [ autoreconfHook pkgconfig file protobufc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ file protobufc ]; meta = with stdenv.lib; { homepage = https://github.com/algernon/riemann-c-client; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index e321670068cf..2ff86f5cbdf6 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; - buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 3e2953c57334..d6cad51ce753 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -28,8 +28,9 @@ in stdenv.mkDerivation { sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem gperf + which autoconf automake libtool libcap ostree rpm glib libgsystem gperf json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fbef31fb5467..72d45c90f106 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ]; + [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index a749f250c11d..61370ff890bc 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.5"; + version = "2.6"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf"; + sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index f9fee08d0dd0..2b240e022d81 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - buildInputs = [ pkgconfig libcaca ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libcaca ]; meta = { description = "Display large colourful characters in text mode"; diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index 2b1f5da6e2f9..d2a4ed39e9ac 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec { }; ucdtxt = fetchurl { - url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData-11.0.0d1.txt; - sha256 = "0y9l0sap7yq7c7c8d0fivzycqaw0zncbxzh1inggg42308z974rn"; + url = http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt; + sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; }; postFixup = '' diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 8d9d0073b178..99cd407a9ae4 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index a18c03b126ac..59efcaa18095 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index f39eaf0b047b..b9a8f70ff71a 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - buildInputs = [ pkgconfig cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 1fd3b3d8371f..d8959687945a 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -4,13 +4,13 @@ }: pythonPackages.buildPythonApplication rec { name = "xflux-gui-${version}"; - version = "2016-09-21"; + version = "1.1.10"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "0b56204477494b473a390e8b0db043437ec14f32"; - sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; + rev = "v${version}"; + sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8"; }; propagatedBuildInputs = with pythonPackages; [ @@ -32,7 +32,6 @@ pythonPackages.buildPythonApplication rec { postFixup = '' wrapGAppsHook - makeWrapperArgs="''${gappsWrapperArgs[@]}" wrapPythonPrograms patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py ''; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 350cb89846a7..604868f8c490 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; }; - buildInputs = [ libX11 autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 ]; # We need a README file, otherwise autoconf complains. postUnpack = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c364935b12cb..dc5f6fb03c0c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.09.24"; + version = "2017.10.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0j2m75j0d1n83i7jzpkcj7ir0bkskj024j9b0yi88zipcg740wbx"; + sha256 = "047zinsczn6c96fzkarlb29y7sjwyh84nxlpfpa6mi4rn090wkqb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 6ff08e4ac3fa..c01e419ab239 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; }; - buildInputs = [ pkgconfig openssl pcsclite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl pcsclite ]; configureFlags = [ "--with-backend=pcsc" ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 3b7c2926bd49..5a56430c20e9 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - buildInputs = [ libpcap openssl zlib libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap openssl zlib libnl ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index fe30a1eab826..766ae4116061 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { configureFlags = "--with-perl=${perl}/bin/perl"; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; meta = with stdenv.lib; { description = "Clients for ARGUS"; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 673f98e2f3ad..e5c2aace4006 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - buildInputs = [ libpcap pkgconfig bison cyrus_sasl tcp_wrappers flex ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; propagatedBuildInputs = [ procps which wget lsof net_snmp ]; patchPhase = '' diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 22da8486a80b..632b52fd1560 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -9,8 +9,10 @@ let url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz"; sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake openssl nss pkgconfig nspr + cmake openssl nss nspr ]; compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 22237794f079..24c86f4fa9a6 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; preConfigure = '' diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index b805a4bfcf32..5ddb663a4ae5 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "0xb03dya1zhcn1gch2v2ynifxw95g8m3plr9q4ys0s3pvgf0g4cx"; + sha256 = "05j17i1zlg19v8jkzlp710kbdgnb4541zgkqxqzcwglcvlc6g7rj"; }; buildInputs = [ readline texinfo nss nspr ] diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index b5866c2ee130..7c42cc965a00 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; }; - buildInputs = [ autoconf automake libtool glib gtk3 dbus pkgconfig file intltool connman ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; preConfigure = '' rm m4/intltool.m4 diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4ec79af66516..c01dbbaa3a71 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.55.1"; + name = "curl-7.56.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5"; + sha256 = "1pvr2bqfhk46bzq2x2hskmnq3wc8qxlps7apm9q1qiixb9ra8q6y"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; - CXX = "g++"; - CXXCPP = "g++ -E"; + CXX = "c++"; + CXXCPP = "c++ -E"; postInstall = '' moveToOutput bin/curl-config "$dev" diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 37226d3dd7b2..3be2b0401bc4 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { name = "davix-0.6.4"; - buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv cmake openssl libxml2 boost ]; src = fetchFromGitHub { owner = "cern-it-sdc-id"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 7204ddd5e06f..d8316c66203d 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 801d41c852b8..badf33074465 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.77"; + name = "dnsmasq-2.78"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "12lbbwpy1wxi6n5dngv30x8g8v13apdnvjgq7w71f9dfa0f3pb3f"; + sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; }; preBuild = '' diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix new file mode 100644 index 000000000000..bb7c688480f0 --- /dev/null +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.9"; + name = "dnstracer"; + + src = fetchurl { + url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz"; + sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; + }; + + outputs = [ "out" "man" ]; + + setOutputFlags = false; + + meta = with stdenv.lib; { + description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; + homepage = http://www.mavetju.org/unix/general.php; + license = licenses.bsd2; + maintainers = with maintainers; [ andir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 1f34952ad24b..5b39ca464601 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { name = "driftnet-${version}"; version = "1.1.5"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libpcap libjpeg libungif libpng giflib + libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook ]; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index b122f532630d..312906f95100 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix new file mode 100644 index 000000000000..88a6b74686c2 --- /dev/null +++ b/pkgs/tools/networking/goklp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goklp-${version}"; + version = "1.6"; + + goPackagePath = "github.com/AppliedTrust/goklp"; + + src = fetchFromGitHub { + owner = "AppliedTrust"; + repo = "goklp"; + rev = "v${version}"; + sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; + homepage = https://github.com/AppliedTrust/goklp; + maintainers = with maintainers; [ disassembler ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/networking/goklp/deps.nix b/pkgs/tools/networking/goklp/deps.nix new file mode 100644 index 000000000000..2f6481f237f8 --- /dev/null +++ b/pkgs/tools/networking/goklp/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/asaskevich/govalidator"; + fetch = { + type = "git"; + url = "https://github.com/asaskevich/govalidator"; + rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7"; + sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } +] diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index ea78cdd106ac..fcbf5a4e1b2a 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av gnome2.gnome_icon_theme makeWrapper]; postInstall = '' diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index a7d42b773172..cbcaee4de784 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; - buildInputs = [libdnet pkgconfig libpcap]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libdnet libpcap]; meta = { description = ""; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 761dc01d2f98..8b81e0696c23 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl db cyrus_sasl ]; meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index ec2f34f56010..19626174ba4c 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; - buildInputs = [ autoconf libpcap ncurses pkgconfig glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf libpcap ncurses glib ]; patches = [ ./no-dns-resolution.patch diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index de7f38314fc6..59e33e818702 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ] ++ optional docs xmlto; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index da36ef727c2d..950a6e310ebd 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg"; }; - buildInputs = [ pkgconfig pcre perl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pcre perl ]; patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 583100e0f371..7348cd7f1165 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, python3, glibcLocales }: +{ stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: let p = python3.override { @@ -19,6 +19,19 @@ let sha256 = "00daa04c9870345f56605d91d7d4897bc1b16f6fff7c74cb602b08ef16c0fb43"; }; }); + pyopenssl = super.pyopenssl.overridePythonAttrs (oldAttrs: rec { + version = "17.0.0"; + name = "${oldAttrs.pname}-${version}"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; + }; + patches = fetchpatch { + url = "https://github.com/pyca/pyopenssl/commit/" + + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; + sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; + }; + }); }; }; in p.pkgs.buildPythonPackage rec { @@ -70,6 +83,6 @@ in p.pkgs.buildPythonPackage rec { description = "Man-in-the-middle proxy"; homepage = http://mitmproxy.org/; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz kamilchm ]; }; } diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 1f465bc4f8a8..e66209c7ce95 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl ]; patches = [ ./ssh_path.patch ]; postPatch = '' diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 3269f92d7f42..255d430a3a5d 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - buildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] ++ optional stdenv.isLinux systemd; meta = { diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 9e7282c40bdd..93646d58cd30 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; - buildInputs = [ makeWrapper pkgconfig python openldap pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper python openldap pam ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 4fccb107771a..132ae3cf0da0 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--without-openssl-version-check" ]; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; meta = { diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 48abd9a33742..b1ecc6cba89b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -14,6 +14,7 @@ in stdenv.mkDerivation { rev = "v${version}"; sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl ppp ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8343f23a1a03..79f203f77470 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - buildInputs = [ zlib openssl libedit pkgconfig pam ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 9646c47a8d71..87785f50e6fa 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0y9759sxx5dyamyw8w58dsxq7bmnn57q7s2f4cw2zln2pp5gripw"; }; - buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libtool autoconf automake cppunit openssl libsigcxx zlib ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index bd3c28504800..6ab462ac5a8c 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { sha256 = "0cxyakc09bn6wjfj42gh508hc62awx825skzacpizx2bqs6v7xvb"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libtool autoconf automake cppunit + libtool autoconf automake cppunit libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c ]; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 1b537870b09d..5cb65b78ee8b 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "samplicator-${version}"; version = "1.3.8rc1"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; src = fetchFromGitHub { owner = "sleinen"; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 53465a0242dd..acb5a042ffcc 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ]; - buildInputs = [ unbound pkgconfig unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 8c443282e5cb..c3abdd49e138 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; }; - buildInputs = [ autoreconfHook libcrafter lua ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libcrafter lua ]; configureFlags = [ "--with-lua=yes" ]; diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix new file mode 100644 index 000000000000..010d6a7f8e85 --- /dev/null +++ b/pkgs/tools/networking/uqmi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: + +stdenv.mkDerivation { + name = "uqmi-2016-12-19"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uqmi.git"; + rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165"; + sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m"; + }; + + postPatch = '' + substituteInPlace data/gen-header.pl --replace /usr/bin/env "" + patchShebangs . + ''; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ libubox json_c ]; + + meta = with lib; { + description = "Tiny QMI command line utility"; + homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 8082565361b9..fe7327e7d855 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ - pkgconfig cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin + cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin ] ++ lib.optionals withDocs [ doxygen Po4a w3m ] ++ lib.optionals withNLS [ diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index f260241fe6ba..830c576c4062 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id"; }; - buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 2a6a0dcc78a3..98d1802f881a 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; }; - buildInputs = [ socat pkgconfig dysnomia disnix getopt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ socat dysnomia disnix getopt ]; meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 388942f6ad87..70cd83b87a3b 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -13,7 +13,8 @@ buildRustPackage rec { sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; }; depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; - buildInputs = [pkgconfig openssl curl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl curl]; postInstall = '' mkdir -p $out/etc/profile.d diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 78d815eb7c19..860be0e1f791 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index aefd6b7500ce..c67c758b933d 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aespipe-${version}"; - version = "2.4d"; + version = "2.4e"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5"; + sha256 = "0fmr0vk408bf13jydhdmcdhqw31yc9qk329bs9i60alccywapmds"; }; meta = { diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index e450cf5952ee..9eb5858b0573 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; }; - patchPhase = '' + postPatch = '' patchShebangs . substituteInPlace src/Makefile.in --replace /bin/echo echo ''; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index f4c92ac701f4..2a88e4462b6d 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake openssl libgsf gmp ]; installPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index f8ef409813cc..91546f1a78f4 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ pkgconfig perl nss nspr python2 pam intltool makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl nss nspr python2 pam intltool makeWrapper ]; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; postInstall = '' diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index b3625d928b5f..28d568d30ae8 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", - "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", + "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", + "version": "5.6.0" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", - "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", + "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", + "version": "5.6.0" } } \ No newline at end of file diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 8bb3cba15c46..69b4b36fb9b3 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; - buildInputs = [ pkgconfig gnupg gtk2 libxml2 intltool ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index fbd32cdc22df..c180ca6c7202 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj"; }; - buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 87686cd52c12..18d784a59bb7 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { sha256 = "1yv2pwf3vhv9dpbf51fnm0wy03va1cg5r7qaz7rg75cwbgb0rmrl"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo + libgcrypt libassuan libksba libiconv npth gettext texinfo readline libusb gnutls adns openldap zlib bzip2 sqlite ]; diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 7b3e7d99a437..ba024328ba5f 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "20170922.f76290"; + version = "20171004.40555d"; goPackagePath = "github.com/keybase/kbfs"; - subPackages = [ "kbfsfuse" ]; + subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; dontRenameImports = true; src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "f76290f6e1a8cbaa6046980c67c548fbff9e123a"; - sha256 = "1v086wmc0hly4b91y6xndfdhj981n2yr6nnb3rl6f4kwx291ih54"; + rev = "40555dbc9c93a05f3a82053860df30e45c7bd779"; + sha256 = "08wj8fh1ja8kfzvbza5csy9mpfy39lifnzvfrnbj7vyyv88qc3h0"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index a45a6ea2a04c..ce98740e89bd 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.25-20170714172717.73f9070"; + version = "1.0.33-20171003193427.d9ceb86ac"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4"; + sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 229a45b87314..049867afcd72 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.30"; + version = "1.0.33"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0vivc71xfi4y3ydd29b17qxzi10r3a1ppmjjws6vrs0gz58bz1j8"; + sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; }; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 9a593907a533..ebd9a6d5e7ee 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; - buildInputs = [ pkgconfig libnfc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc ]; meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index a223b3e835ae..8a454ca67fde 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [./mf_mini.patch]; - buildInputs = [ pkgconfig libnfc ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnfc ]; meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index b3c1a32f22be..45f995a59350 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 ''; - buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with python2Packages; [ libpcap openssl ] ++ optionals pythonSupport [ makeWrapper python ] ++ optionals graphicalSupport [ libX11 gtk2 pygtk pysqlite pygobject2 pycairo diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 2b606d505bdc..ce310eec5aed 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan + autoreconfHook zlib readline openssl pcsclite libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 667831373c55..0d957fc97e08 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,12 +1,11 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null }: let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk2 != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; - buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -39,12 +38,13 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkWith (hasX) "x") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (qt4 != null) "pinentry-qt4") + (mkWith (libcap != null) "libcap") + (mkEnable (libsecret != null) "libsecret") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (gcr != null) "pinentry-gnome3") + (mkEnable (qt4 != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index e4141d1a61b6..1e626084ee3a 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; - buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ccid qttools pcsclite qttranslations hicolor_icon_theme libdigidocpp opensc shared_mime_info openldap gettext desktop_file_utils makeWrapper ]; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 04f6cbf6d113..f2a997db05f3 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { cd src ''; - buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake ccid qttools pcsclite qttranslations hicolor_icon_theme ]; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index bca93887bd4e..b66564d58cee 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils help2man ]; configurePhase = '' substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}" diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 17652e220da6..464f6d215841 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { automake --add-missing --copy autoconf ''; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool pkgconfig + autoconf automake libtool libxml2 nettle ] ++ stdenv.lib.optional withGTK3 gtk3; diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 40829df56cae..7d0ff797336d 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w"; }; - buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ gawk trousers cryptsetup openssl ]; installPhase = '' mkdir -p $out diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index e49f2f8ed0fb..8309390d013b 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; - buildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 34da8d400811..f99d22becdb8 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; pythonPath = with python2Packages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index e1c163f41709..6dcaeed325ae 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "chase-${version}"; version = "0.5.2"; - buildInputs = [ pkgconfig libatomic_ops boehmgc ] ; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libatomic_ops boehmgc ] ; src = fetchurl { url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz"; sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f"; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 2e12345783d2..6f4b94f826d7 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig curl libdbi libgcrypt libmemcached + curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt libxml2 libmysql postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index fbca63b0e0a3..bcea40b1193f 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; }; - buildInputs = [ libgtop xmessage which pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgtop xmessage which ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index be3a32de251f..25470af9bb30 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; }; - buildInputs = [ autoreconfHook perl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { homepage = https://github.com/dex4er/fakechroot; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index b03ec34972eb..72938216b0a4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 11236b7a9d10..a2bffab3a981 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Not adding 'hostname' command, the build shouldn't depend on what the build # host is called. - buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gtk2 pcre glib libxml2 libsoup ]; # Fixes '#error You must compile this program without "-O"' hardeningDisable = [ "all" ]; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index d8faeea19d84..03373300a948 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; - buildInputs = [ pkgconfig ninja libevdev libev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ninja libevdev libev ]; configurePhase = '' bash ./configure diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index a26237bc045b..499f7c461546 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -19,14 +19,16 @@ stdenv.mkDerivation rec { sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; })]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = lib.optionals withGUI [ gtk2 sqlite ]; + # Fix version info. preConfigure = '' sed -e "s/return \"unknown\"/return \"${version}\"/" \ -i src/core/version.cc ''; - buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; - makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 236474343b4a..ed177820b644 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n"; }; - buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zlib libuuid ]; # Allow UI to load when running as non-root patches = [ ./web_access.patch ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 8a4fe6cb3cff..7508b4fc56c4 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"; }; - buildInputs = [ pkgconfig zlib kmod which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5d65267311f4..640750b4f2d3 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, talloc, docutils +{ stdenv, fetchFromGitHub, fetchpatch +, talloc, docutils , enableStatic ? false }: stdenv.mkDerivation rec { @@ -17,6 +18,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + (fetchpatch { # debian patch for aarch64 build + sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv"; + url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch"; + }) + ]; + preBuild = stdenv.lib.optionalString enableStatic '' export LDFLAGS="-static" ''; @@ -38,6 +46,6 @@ stdenv.mkDerivation rec { description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx ]; + maintainers = with maintainers; [ ianwookim nckx makefu ]; }; } diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix new file mode 100644 index 000000000000..838663c30720 --- /dev/null +++ b/pkgs/tools/system/supervise/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "supervise-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catern"; + repo = "supervise"; + rev = "v${version}"; + sha256 = "1cjdxgns3gh2ir4kcmjdmc480w8sm49inws0ihhjmnisjy4100lg"; + }; + + installPhase = '' + mkdir -p $out/bin + cp supervise unlinkwait -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/catern/supervise; + description = "A minimal unprivileged process supervisor making use of modern Linux features"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 7c81a028810d..a3e90f32c0ab 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; }; - buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index a9a034ebde91..6dfc6d1349d0 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl stdenv.cc.libc.static ] ++ stdenv.lib.optional (libuuid != null) (libuuid.overrideAttrs (attrs: { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index c1c62718de2d..bd6ec17ceec1 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; }; - buildInputs = [ autoconf automake libtool pkgconfig openwsman openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool openwsman openssl ]; preConfigure = '' ./bootstrap diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index e9abae3ac849..7dcd94e5363f 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; - buildInputs = [ cmake pkgconfig libxml2 libzip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake libxml2 libzip ]; preConfigure = '' diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 62206c6c7914..a2a02049d267 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -9,10 +9,14 @@ stdenv.mkDerivation { buildInputs = [ cmake python ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=OFF" + makeFlags = [ + # let intermediate tools find intermediate library + "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(CURDIR)/src" ]; + # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools". + enableParallelBuilding = false; + meta = with stdenv.lib; { homepage = https://github.com/BYVoid/OpenCC; license = licenses.asl20; @@ -23,7 +27,7 @@ stdenv.mkDerivation { phrase-level conversion, variant conversion and regional idioms among Mainland China, Taiwan and Hong kong. ''; - maintainers = [ maintainers.mingchuan ]; + maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 63759184ba47..761a498bcfb6 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a"; }; - buildInputs = [ qt4 perl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ qt4 perl ]; configurePhase = '' mkdir -p $out/{bin,man/man1} diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 34aa0e9c7ed6..156a8bd8f646 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ pcre zlib lzma ]; meta = with stdenv.lib; { homepage = https://github.com/ggreer/the_silver_searcher/; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 203f0940990f..e96644b6d3cf 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; - buildInputs = [ pkgconfig libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 ]; meta = with stdenv.lib; { homepage = http://ofb.net/~egnor/xml2/; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 5ad62cd7140b..4fe6ad6b3dc9 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; - buildInputs = [ pkgconfig libxml2 libxslt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 libxslt ]; preConfigure = '' diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c15f165013b9..34a689ee9bd6 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -61,8 +61,8 @@ core = stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig /*teckit*/ zziplib poppler mpfr gmp pixman potrace gd freetype libpng libpaper zlib perl @@ -156,6 +156,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex hardeningDisable = [ "format" ]; + inherit (core) nativeBuildInputs; buildInputs = core.buildInputs ++ [ core cairo harfbuzz icu graphite2 ]; configureFlags = common.configureFlags @@ -209,7 +210,8 @@ dvisvgm = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ ghostscript zlib freetype potrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype potrace ]; preConfigure = "cd texk/dvisvgm"; @@ -225,7 +227,8 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; preConfigure = "cd texk/dvipng"; @@ -247,7 +250,8 @@ bibtex8 = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ icu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ icu ]; preConfigure = "cd texk/bibtex-x"; @@ -263,7 +267,8 @@ xdvi = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ freetype ghostscript ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ freetype ghostscript ] ++ (with xorg; [ libX11 libXaw libXi libXpm libXmu libXaw libXext libXfixes ]); preConfigure = "cd texk/xdvik"; diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 05ce5057347d..2177937221a1 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoconf automake libxml2 diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3b02f0d3e2ca..197caca0d86c 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ libdv libjpeg libpng pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 0c8a34c57630..3832f3c3be0c 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Fixes build with GCC 6 NIX_CFLAGS_COMPILE = "-std=c++03"; - buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxslt freetype libpng libxml2 ]; meta = { description = "An xml2swf and swf2xml processor with import functionalities"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e8cd91fba8..9e8fc79710ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -55,10 +55,10 @@ with pkgs; stringsWithDeps = lib.stringsWithDeps; - ### Evaluating the entire NixPkgs naively will fail, make failure fast + ### Evaluating the entire Nixpkgs naively will fail, make failure fast AAAAAASomeThingsFailToEvaluate = throw '' Please be informed that this pseudo-package is not the only part of - NixPkgs that fails to evaulate. You should not evaluate entire NixPkgs + Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs without some special measures to handle failing packages, like those taken by Hydra. ''; @@ -560,6 +560,8 @@ with pkgs; bonnie = callPackage ../tools/filesystems/bonnie { }; + bonfire = callPackage ../tools/misc/bonfire { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -675,6 +677,13 @@ with pkgs; libssl = openssl; }; + axoloti = callPackage ../applications/audio/axoloti { }; + dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; + libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + azureus = callPackage ../tools/networking/p2p/azureus { }; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; @@ -772,7 +781,6 @@ with pkgs; bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; @@ -942,6 +950,8 @@ with pkgs; deisctl = callPackage ../development/tools/deisctl {}; + deja-dup = callPackage ../applications/backup/deja-dup { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; @@ -1435,6 +1445,8 @@ with pkgs; cuetools = callPackage ../tools/cd-dvd/cuetools { }; + u3-tool = callPackage ../tools/filesystems/u3-tool { }; + unifdef = callPackage ../development/tools/misc/unifdef { }; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; @@ -1953,6 +1965,8 @@ with pkgs; unikey = callPackage ../tools/inputmethods/fcitx-engines/fcitx-unikey { }; + rime = callPackage ../tools/inputmethods/fcitx-engines/fcitx-rime { }; + m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { @@ -2029,6 +2043,8 @@ with pkgs; lprof = callPackage ../tools/graphics/lprof { }; + fastlane = callPackage ../tools/admin/fastlane { }; + fatresize = callPackage ../tools/filesystems/fatresize {}; fdk_aac = callPackage ../development/libraries/fdk-aac { }; @@ -2297,6 +2313,8 @@ with pkgs; godot = callPackage ../development/tools/godot {}; + goklp = callPackage ../tools/networking/goklp {}; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; go-pup = callPackage ../development/tools/pup { }; @@ -2475,6 +2493,8 @@ with pkgs; pgjwt = callPackage ../servers/sql/postgresql/pgjwt {}; + pgtap = callPackage ../servers/sql/postgresql/pgtap {}; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -2697,6 +2717,7 @@ with pkgs; iperf = iperf3; ipfs = callPackage ../applications/networking/ipfs { }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipmitool = callPackage ../tools/system/ipmitool { static = false; @@ -2828,6 +2849,8 @@ with pkgs; knockknock = callPackage ../tools/security/knockknock { }; + kore = callPackage ../development/web/kore { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; @@ -3873,6 +3896,10 @@ with pkgs; gtk2 = null; }; + pinentry_gnome = pinentry_ncurses.override { + gcr = gnome3.gcr; + }; + pinentry_qt4 = pinentry_ncurses.override { inherit qt4; }; @@ -4650,6 +4677,7 @@ with pkgs; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; tor-browser-unwrapped = firefoxPackages.tor-browser; + inherit (python27Packages) obfsproxy; }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -4753,6 +4781,8 @@ with pkgs; upx = callPackage ../tools/compression/upx { }; + uqmi = callPackage ../tools/networking/uqmi { }; + uriparser = callPackage ../development/libraries/uriparser {}; urlscan = callPackage ../applications/misc/urlscan { }; @@ -4781,6 +4811,8 @@ with pkgs; inherit (perlPackages) ShellCommand TestMost; }; + vcstool = callPackage ../development/tools/vcstool { }; + verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog {}; @@ -5338,6 +5370,7 @@ with pkgs; useMacosReexportHack = true; }; + clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; @@ -5362,7 +5395,7 @@ with pkgs; clangWrapSelf = build: ccWrapperFun { cc = build; isClang = true; - stdenv = clangStdenv; + inherit stdenvNoCC; libc = glibc; extraPackages = [ libcxx libcxxabi ]; nativeTools = false; @@ -5395,7 +5428,9 @@ with pkgs; ''; }); - crystal = callPackage ../development/compilers/crystal { }; + crystal = callPackage ../development/compilers/crystal { + llvm = llvm_4; + }; devpi-client = callPackage ../development/tools/devpi-client {}; @@ -5985,13 +6020,17 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = llvmPackages_4.lld; + lld = llvmPackages.lld; + lld_4 = llvmPackages_4.lld; + lld_5 = llvmPackages_5.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; + lldb_5 = llvmPackages_5.lldb; llvm = llvmPackages.llvm; + llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; @@ -6033,6 +6072,10 @@ with pkgs; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; }); + llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + inherit (stdenvAdapters) overrideCC; + }; + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -6266,6 +6309,7 @@ with pkgs; vala_0_28 vala_0_32 vala_0_34 + vala_0_38 vala; valadoc = callPackage ../development/tools/valadoc { }; @@ -6274,11 +6318,11 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun { + wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun rec { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - noLibc = (libc == null); + noLibc = !nativeLibc && (libc == null); isGNU = cc.isGNU or false; isClang = cc.isClang or false; @@ -6657,7 +6701,7 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_7 + ruby_2_2_8 ruby_2_3_5 ruby_2_4_2; @@ -6665,7 +6709,7 @@ with pkgs; ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_7; + ruby_2_2 = ruby_2_2_8; ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_2; @@ -7057,6 +7101,8 @@ with pkgs; dejagnu = callPackage ../development/tools/misc/dejagnu { }; + devtodo = callPackage ../development/tools/devtodo { }; + dfeet = callPackage ../development/tools/misc/d-feet { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; @@ -7314,6 +7360,8 @@ with pkgs; mk = callPackage ../development/tools/build-managers/mk { }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + moby = callPackage ../development/tools/misc/moby { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -7400,12 +7448,6 @@ with pkgs; pmccabe = callPackage ../development/tools/misc/pmccabe { }; - /* Make pkgconfig always return a nativeDrv, never a proper crossDrv, - because most usage of pkgconfig as buildInput (inheritance of - pre-cross nixpkgs) means using it using as nativeBuildInput - cross_renaming: we should make all programs use pkgconfig as - nativeBuildInput after the renaming. - */ pkgconfig = callPackage ../development/tools/misc/pkgconfig { fetchurl = fetchurlBoot; }; @@ -7587,7 +7629,7 @@ with pkgs; universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_2; + ruby = ruby_2_3; }; bashdb = callPackage ../development/tools/misc/bashdb { }; @@ -8603,7 +8645,10 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu = callPackage ../development/libraries/icu { }; + icu58 = callPackage ../development/libraries/icu/58.nix { }; + icu59 = callPackage ../development/libraries/icu/59.nix { }; + + icu = icu58; id3lib = callPackage ../development/libraries/id3lib { }; @@ -9194,6 +9239,8 @@ with pkgs; librevisa = callPackage ../development/libraries/librevisa { }; + librime = callPackage ../development/libraries/librime {}; + libsamplerate = callPackage ../development/libraries/libsamplerate { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; }; @@ -9520,6 +9567,8 @@ with pkgs; libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libubox = callPackage ../development/libraries/libubox { }; + libuecc = callPackage ../development/libraries/libuecc { }; libui = callPackage ../development/libraries/libui { }; @@ -9722,6 +9771,8 @@ with pkgs; mapnik = callPackage ../development/libraries/mapnik { }; + marisa = callPackage ../development/libraries/marisa {}; + matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; @@ -10267,8 +10318,14 @@ with pkgs; kirigami_1 kirigami_2; + kdb = callPackage ../development/libraries/kdb { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; + kproperty = callPackage ../development/libraries/kproperty { }; + + kreport = callPackage ../development/libraries/kreport { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -11688,7 +11745,8 @@ with pkgs; oracleXE = callPackage ../servers/sql/oracle-xe { }; softether_4_18 = callPackage ../servers/softether/4.18.nix { }; - softether = softether_4_18; + softether_4_20 = callPackage ../servers/softether/4.20.nix { }; + softether = softether_4_20; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; @@ -11716,7 +11774,8 @@ with pkgs; postgresql93 postgresql94 postgresql95 - postgresql96; + postgresql96 + postgresql100; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -11786,6 +11845,8 @@ with pkgs; s6-rc = callPackage ../tools/system/s6-rc { }; + supervise = callPackage ../tools/system/supervise { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; @@ -12661,6 +12722,8 @@ with pkgs; delve = callPackage ../development/tools/delve { }; + dep = callPackage ../development/tools/dep { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; @@ -13052,6 +13115,8 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; + brise = callPackage ../data/misc/brise { }; + inherit (kdeFrameworks) breeze-icons; cacert = callPackage ../data/misc/cacert { }; @@ -13773,10 +13838,15 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra = kde4.callPackage ../applications/office/calligra { + calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { vc = vc_0_7; }; + calligra = libsForQt5.callPackage ../applications/office/calligra { + inherit (kdeApplications) akonadi-calendar akonadi-contacts; + openjpeg = openjpeg_1; + }; + camlistore = callPackage ../applications/misc/camlistore { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -14425,6 +14495,10 @@ with pkgs; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + googler = callPackage ../applications/misc/googler { + python = python3; + }; + gopher = callPackage ../applications/networking/gopher/gopher { }; gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; @@ -14501,6 +14575,7 @@ with pkgs; libpng = libpng_apng; python = python2; gnused = gnused_422; + icu = icu59; }; }); @@ -14619,6 +14694,8 @@ with pkgs; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + gcolor3 = callPackage ../applications/graphics/gcolor3 { }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; getxbook = callPackage ../applications/misc/getxbook {}; @@ -14760,7 +14837,9 @@ with pkgs; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - gramps = callPackage ../applications/misc/gramps { }; + gramps = callPackage ../applications/misc/gramps { + pythonPackages = python3Packages; + }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; @@ -15134,6 +15213,8 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; + kexi = libsForQt5.callPackage ../applications/office/kexi { }; + keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; @@ -15161,7 +15242,7 @@ with pkgs; kiwix = callPackage ../applications/misc/kiwix { }; - kmplayer = kde4.callPackage ../applications/video/kmplayer { }; + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; kodestudio = callPackage ../applications/editors/kodestudio { }; @@ -15177,6 +15258,8 @@ with pkgs; ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; @@ -16091,6 +16174,8 @@ with pkgs; gst-plugins-bad = null; }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; @@ -16108,6 +16193,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { }; + rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -16251,7 +16338,7 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = callPackage ../applications/graphics/simple-scan { }; + simple-scan = gnome3.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -16299,7 +16386,7 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; sonic-pi = callPackage ../applications/audio/sonic-pi { - ruby = ruby_2_2; + ruby = ruby_2_3; }; st = callPackage ../applications/misc/st { @@ -16390,10 +16477,7 @@ with pkgs; smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { - btrfs-progs = btrfs-progs_4_4_1; - stdenv = overrideCC stdenv gcc5; - }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; @@ -16645,6 +16729,8 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + tqsl = callPackage ../applications/misc/tqsl { }; + transcode = callPackage ../applications/audio/transcode { }; transcribe = callPackage ../applications/audio/transcribe { }; @@ -18087,6 +18173,8 @@ with pkgs; orion = callPackage ../misc/themes/orion {}; + deepin-gtk-theme = callPackage ../misc/themes/deepin { }; + albatross = callPackage ../misc/themes/albatross { }; gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; @@ -18576,7 +18664,7 @@ with pkgs; eagle = callPackage ../applications/science/electronics/eagle { }; - caneda = callPackage ../applications/science/electronics/caneda { }; + caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; geda = callPackage ../applications/science/electronics/geda { guile = guile_2_0; @@ -18908,8 +18996,6 @@ with pkgs; fceux = callPackage ../misc/emulators/fceux { }; - flat-plat = callPackage ../misc/themes/flat-plat { }; - flockit = callPackage ../tools/backup/flockit { }; foldingathome = callPackage ../misc/foldingathome { }; @@ -18992,6 +19078,9 @@ with pkgs; martyr = callPackage ../development/libraries/martyr { }; + # previously known as flat-plat + materia-theme = callPackage ../misc/themes/materia-theme { }; + mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; }; @@ -19450,8 +19539,9 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom {}; - yabause = callPackage ../misc/emulators/yabause { - qt = qt4; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { + freeglut = null; + openal = null; }; yadm = callPackage ../applications/version-management/yadm { }; @@ -19581,10 +19671,14 @@ with pkgs; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; + cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; }; + cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; duti = callPackage ../os-specific/darwin/duti {}; + + dnstracer = callPackage ../tools/networking/dnstracer {}; } diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4734b51046fd..3e447aa653cd 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -94,7 +94,8 @@ let rev = "v${version}"; sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl"; }; - buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ]; packageRequires = [ tablist let-alist ]; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ed9e09802b7d..7e63041867de 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -13,8 +13,8 @@ with pkgs; rec { pythonSupport = false; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ]; + buildInputs = old.buildInputs ++ [ zlib nodejs ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; checkPhase = '' @@ -39,7 +39,8 @@ with pkgs; rec { xmlmirror = buildEmscriptenPackage rec { name = "xmlmirror"; - buildInputs = [ autoconf automake libtool pkgconfig gnumake libxml2 nodejs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool gnumake libxml2 nodejs python openjdk json_c zlib ]; src = fetchgit { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 00550df1099f..ff1108471bdb 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -379,7 +379,7 @@ let url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; - buildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; @@ -508,7 +508,8 @@ let platforms = platforms.unix; }; - buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobjectIntrospection lua ]; makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; @@ -521,7 +522,8 @@ let name = "lua-mpack-${libmpack.version}"; src = libmpack.src; sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; - buildInputs = [ libmpack ]; #libtool lua pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmpack ]; #libtool lua ]; dontBuild = true; preInstall = '' mkdir -p $out/lib/lua/${lua.luaversion} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4af5a810fd06..275c0739ce65 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,7 +114,10 @@ let benchmark = callPackage ../development/ocaml-modules/benchmark { }; - biniou = callPackage ../development/ocaml-modules/biniou { }; + biniou = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/biniou { } + else callPackage ../development/ocaml-modules/biniou/1.0.nix { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; @@ -433,17 +436,12 @@ let pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; - ocaml_react = callPackage ../development/ocaml-modules/react { }; - reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; - ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; - ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; ocf = callPackage ../development/ocaml-modules/ocf { }; @@ -593,6 +591,10 @@ let re = callPackage ../development/ocaml-modules/re { }; + react = callPackage ../development/ocaml-modules/react { }; + + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; + reason = callPackage ../development/compilers/reason { }; rope = callPackage ../development/ocaml-modules/rope { }; @@ -605,6 +607,8 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + ssl = callPackage ../development/ocaml-modules/ssl { }; + stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; @@ -625,6 +629,8 @@ let sawja = callPackage ../development/ocaml-modules/sawja { }; + stdint = callPackage ../development/ocaml-modules/stdint { }; + uucd = callPackage ../development/ocaml-modules/uucd { }; uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eae18c1b5ed9..2ad39ccd2801 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9960,8 +9960,8 @@ let self = _self // overrides; _self = with self; { # Build.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access + nativeBuildInputs = [ pkgs.pkgconfig ]; #buildInputs = [ TestMore TestPod ]; - buildInputs = [ pkgs.pkgconfig ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; @@ -11976,13 +11976,13 @@ let self = _self // overrides; _self = with self; { }; }; - ServerStarter = buildPerlModule { - name = "Server-Starter-0.32"; + ServerStarter = buildPerlModule rec { + name = "Server-Starter-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz; - sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a"; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; + sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6"; }; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; + buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ]; meta = { homepage = https://github.com/kazuho/p5-Server-Starter; description = "A superdaemon for hot-deploying server programs"; @@ -12013,11 +12013,15 @@ let self = _self // overrides; _self = with self; { }; }; - SetObject = buildPerlPackage { - name = "Set-Object-1.34"; + SetObject = buildPerlPackage rec { + name = "Set-Object-1.35"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.34.tar.gz; - sha256 = "1dipd6k572pzqjzbj9vagb2k347qcg29lsxzx9y214bhnw7fgvjp"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7"; + }; + meta = { + description = "Unordered collections (sets) of Perl Objects"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -12851,17 +12855,18 @@ let self = _self // overrides; _self = with self; { sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4"; }; propagatedBuildInputs = [XMLXPath]; - buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.pkgconfig pkgs.libvirt]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.libvirt]; meta = { platforms = stdenv.lib.platforms.linux; }; }; - TAPParserSourceHandlerpgTAP = buildPerlModule { - name = "TAP-Parser-SourceHandler-pgTAP-3.30"; + TAPParserSourceHandlerpgTAP = buildPerlModule rec { + name = "TAP-Parser-SourceHandler-pgTAP-3.33"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.30.tar.gz; - sha256 = "08gadqf898r23sx07sn13555cp9zkwp8igjlh1fza2ycfivpfl9f"; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; }; meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; @@ -15456,10 +15461,15 @@ let self = _self // overrides; _self = with self; { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.58"; + name = "Variable-Magic-0.61"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; - sha256 = "1yhh3zbawx68sw93xrnvfnqq5pb2pmbk20rckqxbwkq1n8c6lv83"; + url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7"; + }; + meta = { + homepage = http://search.cpan.org/dist/Variable-Magic/; + description = "Associate user-defined magic to variables from Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d7ad2eb85b6e..20b8c15f388f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -91,7 +91,8 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; # Not released yet @@ -109,7 +110,8 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; pcs = buildPecl rec { @@ -162,9 +164,7 @@ let "--with-yaml=${pkgs.libyaml}" ]; - buildInputs = [ - pkgs.pkgconfig - ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; yaml20 = assert isPhp7; buildPecl { @@ -176,9 +176,7 @@ let "--with-yaml=${pkgs.libyaml}" ]; - buildInputs = [ - pkgs.pkgconfig - ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation. @@ -197,7 +195,7 @@ let "--with-zmq=${pkgs.zeromq}" ]; - buildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # No support for PHP 7 and probably never will be diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d3b38066b54..f35991eeaed0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -291,6 +291,8 @@ in { sip = callPackage ../development/python-modules/sip { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; + tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; @@ -776,12 +778,12 @@ in { in buildPythonPackage rec { name = "${pname}-${version}"; pname = "awscli"; - version = "1.11.108"; + version = "1.11.162"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf"; + sha256 = "0ff17fdzzncrzl7ps1cyrs0c5f82ncbvflnjz8sd1vkcmn9yij8r"; }; # No tests included @@ -2091,7 +2093,8 @@ in { buildInputs = [ pkgs.db ]; # Judging from SyntaxError in test - disabled = isPy3k; +# disabled = isPy3k; + doCheck = false; # test suite breaks python3 compatibility # Path to database need to be set. # Somehow the setup.py flag is not propagated. @@ -2145,13 +2148,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.4"; + version = "1.4.7"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl"; + sha256 = "0ca08xkkx6py08gqgn1aci9pklidwivxbvpwjv7623jr21avakdi"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ @@ -2184,11 +2187,11 @@ in { botocore = buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.5.71"; + version = "1.7.20"; src = fetchPypi { inherit pname version; - sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm"; + sha256 = "16sy35bp9i2g9785l8jzcd4ddc2nydqs3wnkqwi36xx6l3bdbn13"; }; propagatedBuildInputs = with self; [ @@ -2355,25 +2358,7 @@ in { }; }; - devpi-common = buildPythonPackage rec { - name = "devpi-common"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz"; - sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j"; - }; - - propagatedBuildInputs = [ self.requests self.py ]; - - meta = { - homepage = https://bitbucket.org/hpk42/devpi; - description = "Utilities jointly used by devpi-server and devpi-client"; - license = licenses.mit; - maintainers = with maintainers; [ lewo makefu ]; - }; - }; - + devpi-common = callPackage ../development/python-modules/devpi-common { }; # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; @@ -6179,13 +6164,13 @@ in { sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f"; }; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with self; [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp - pkgs.pkgconfig ]; propagatedBuildInputs = with self; [ numpy ]; @@ -7221,7 +7206,8 @@ in { }; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; - buildInputs = [ pkgs.pkgconfig pkgs.poppler.dev ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.poppler.dev ]; propagatedBuildInputs = with self; [ pycairo pygobject2 ]; patches = [ @@ -9489,7 +9475,8 @@ in { sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; }; - buildInputs = with self; [ pkgs.pkgconfig pkgs.fuse ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.fuse ]; meta = { description = "Python bindings for FUSE"; @@ -11225,27 +11212,7 @@ in { linode-api = callPackage ../development/python-modules/linode-api { }; - livereload = buildPythonPackage rec { - name = "livereload-${version}"; - version = "2.5.0"; - - src = pkgs.fetchFromGitHub { - owner = "lepture"; - repo = "python-livereload"; - rev = "v${version}"; - sha256 = "0ixsc7wibmkfk9fnyq0d1b5d9snxfpzzzgsxvq28rn54v6q8b7m2"; - }; - - buildInputs = with self; [ nose django ]; - - propagatedBuildInputs = with self; [ tornado six ]; - - meta = { - description = "Runs a local server that reloads as you develop"; - homepage = "https://github.com/lepture/python-livereload"; - license = licenses.bsd3; - }; - }; + livereload = callPackage ../development/python-modules/livereload { }; llfuse = buildPythonPackage rec { name = "llfuse-1.0"; @@ -11255,7 +11222,8 @@ in { sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; }; - buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ]; propagatedBuildInputs = with self; [ contextlib2 ]; @@ -13201,7 +13169,8 @@ in { configure ''; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -14167,17 +14136,19 @@ in { cmd2 = buildPythonPackage rec { name = "cmd2-${version}"; - version = "0.6.8"; + version = "0.7.7"; src = pkgs.fetchurl { url = "mirror://pypi/c/cmd2/${name}.tar.gz"; - sha256 = "1a346zcd46c8gwbbp2cxsmvgfkyy26kwxjzdnkv7n47w6660sy5c"; + sha256 = "0widbir8ay1fd4zm8l0rjq78j1cvbammbz8xs32crbanqsgzpqml"; }; # No tests included doCheck = false; propagatedBuildInputs = with self; [ + pyperclip + six pyparsing ]; @@ -15629,27 +15600,7 @@ in { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; - - platformio = buildPythonPackage rec { - name = "platformio-${version}"; - version="2.10.3"; - - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/b7/a3/1d3a9d7bae91df1b607e0f31549ec3e0006f29484cc6a1431b3fe3c5b02e/platformio-2.10.3.tar.gz"; - sha256 = "f3a646871f9baed05f336a32576edaab90abf0737d8adb54f2acb7bcad42a65f"; - }; - - propagatedBuildInputs = with self; [ click_5 requests bottle pyserial lockfile colorama]; - - meta = with stdenv.lib; { - description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; - maintainers = with maintainers; [ mog ]; - license = licenses.asl20; - }; - }; + platformio = callPackage ../development/python-modules/platformio { }; pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; @@ -16498,7 +16449,8 @@ in { patchShebangs . ''; - buildInputs = [ self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio ] + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; @@ -16861,6 +16813,8 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; + pysmbc = callPackage ../development/python-modules/pysmbc { }; + pyspread = callPackage ../development/python-modules/pyspread { }; pyx = buildPythonPackage rec { @@ -16873,7 +16827,7 @@ in { }; disabled = !isPy3k; - + # No tests in archive doCheck = false; @@ -17200,7 +17154,7 @@ in { PATH="${pkgs.parted}/sbin:$PATH" ''; - buildInputs = with self; [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; propagatedBuildInputs = with self; [ pkgs.parted ]; @@ -17793,11 +17747,12 @@ in { }; pyopenssl = buildPythonPackage rec { - name = "pyopenssl-${version}"; + pname = "pyOpenSSL"; + name = "${pname}-${version}"; version = "17.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; + src = self.fetchPypi { + inherit pname version; sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; }; @@ -17892,22 +17847,7 @@ in { }; }; - pyserial = buildPythonPackage rec { - name = "pyserial-2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyserial/${name}.tar.gz"; - sha256 = "3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477"; - }; - - doCheck = false; - - meta = { - homepage = "http://pyserial.sourceforge.net/"; - license = licenses.psfl; - description = "Python serial port extension"; - }; - }; + pyserial = callPackage ../development/python-modules/pyserial {}; pymongo = callPackage ../development/python-modules/pymongo {}; @@ -18182,8 +18122,9 @@ in { sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2"; }; + nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ - pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2 + pkgs.gtk2 self.pygtk pkgs.libxml2 pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu ]; @@ -19889,21 +19830,7 @@ in { }; }; - spambayes = buildPythonPackage rec { - name = "spambayes-1.1b1"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/spambayes/${name}.tar.gz"; - sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; - }; - - propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ]; - - meta = { - description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; - homepage = http://spambayes.sourceforge.net/; - }; - }; + spambayes = callPackage ../development/python-modules/spambayes { }; shapely = callPackage ../development/python-modules/shapely { }; @@ -20347,7 +20274,8 @@ in { sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl"; }; - buildInputs = [ pkgs.pkgconfig self.pytest_28 self.pytestrunner ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ self.pytest_28 self.pytestrunner ]; propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ]; # Tests are not included in archive @@ -20372,22 +20300,7 @@ in { }; }; - semantic-version = buildPythonPackage rec { - pname = "semantic_version"; - version = "2.4.2"; - name = "${pname}${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2"; - }; - - meta = { - description = "A library implementing the 'SemVer' scheme"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + semantic-version = callPackage ../development/python-modules/semantic-version { }; sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; @@ -20432,8 +20345,9 @@ in { sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; }; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ]; }; @@ -20996,7 +20910,8 @@ in { src = pkgs.subunit.src; propagatedBuildInputs = with self; [ testtools testscenarios ]; - buildInputs = [ pkgs.pkgconfig pkgs.check pkgs.cppunit ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.check pkgs.cppunit ]; patchPhase = '' sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py @@ -24122,7 +24037,8 @@ EOF sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; }; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ python pkgs.libvirt lxml ]; buildPhase = "${python.interpreter} setup.py build"; @@ -24261,7 +24177,8 @@ EOF preBuild = "${python}/bin/${python.executable} setup.py build_ext"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - buildInputs = with self; [ pkgs.pkgconfig pkgs.enlightenment.efl ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with self; [ pkgs.enlightenment.efl ]; doCheck = false; meta = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 41ab5da8067d..d6cefb8d184b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -38,13 +38,31 @@ let meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = [ jobs.tarball - jobs.stdenv.x86_64-darwin - jobs.ghc.x86_64-darwin jobs.cabal2nix.x86_64-darwin - jobs.ruby.x86_64-darwin + jobs.emacs.x86_64-darwin + jobs.ghc.x86_64-darwin + jobs.git.x86_64-darwin + jobs.go.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.nix-repl.x86_64-darwin + jobs.nix.x86_64-darwin + jobs.nox.x86_64-darwin + jobs.openssh.x86_64-darwin + jobs.openssl.x86_64-darwin + jobs.postgresql.x86_64-darwin jobs.python.x86_64-darwin + jobs.python3.x86_64-darwin + jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin - jobs.go.x86_64-darwin + jobs.stdenv.x86_64-darwin + jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin ]; }; @@ -76,6 +94,20 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-linux + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-linux + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-linux + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-linux + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-linux + jobs.tests.stdenv-inputs.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 6c39d865ac21..92230993d58f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-09-10"; + name = "rustRegistry-2017-10-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "2e573cbbb2db591ff9d46339910f21e35b21339f"; - sha256 = "0sgpc2aygmvyjb3kinzh83bj4j92ny18159alqb1x8w26wqmisfq"; + rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86"; + sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' |